From b189e0b7cfd8e761b313ab3b1c27371ff270a056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 29 Oct 2020 16:01:22 +0100
Subject: [PATCH] Revert "Load SeasonalBackgroundLoader asynchronously"

This reverts commit 81ebcd879668eb13cb28aa11bf4edfb8afb0fb99.
---
 .../Backgrounds/BackgroundScreenDefault.cs    | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index ec91dcc99f..ef41c5be3d 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -25,7 +25,6 @@ namespace osu.Game.Screens.Backgrounds
         private Bindable<Skin> skin;
         private Bindable<BackgroundSource> mode;
         private Bindable<IntroSequence> introSequence;
-        private readonly SeasonalBackgroundLoader seasonalBackgroundLoader = new SeasonalBackgroundLoader();
 
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
@@ -51,7 +50,7 @@ namespace osu.Game.Screens.Backgrounds
 
             currentDisplay = RNG.Next(0, background_count);
 
-            LoadComponentAsync(seasonalBackgroundLoader, _ => LoadComponentAsync(createBackground(), display));
+            display(createBackground());
         }
 
         private void display(Background newBackground)
@@ -91,10 +90,6 @@ namespace osu.Game.Screens.Backgrounds
             {
                 switch (mode.Value)
                 {
-                    case BackgroundSource.Seasonal:
-                        newBackground = seasonalBackgroundLoader.LoadBackground(backgroundName);
-                        break;
-
                     case BackgroundSource.Beatmap:
                         newBackground = new BeatmapBackground(beatmap.Value, backgroundName);
                         break;
@@ -105,18 +100,7 @@ namespace osu.Game.Screens.Backgrounds
                 }
             }
             else
-            {
-                switch (mode.Value)
-                {
-                    case BackgroundSource.Seasonal:
-                        newBackground = seasonalBackgroundLoader.LoadBackground(backgroundName);
-                        break;
-
-                    default:
-                        newBackground = new Background(backgroundName);
-                        break;
-                }
-            }
+                newBackground = new Background(backgroundName);
 
             newBackground.Depth = currentDisplay;