From e9ab329e930c874064860f204f82ae9711d1045e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Mar 2019 00:05:05 +0900
Subject: [PATCH] Fix backgrounds not correctly handling initial async load

---
 .../Backgrounds/BackgroundScreenBeatmap.cs    | 44 +++++++++++--------
 .../Backgrounds/BackgroundScreenDefault.cs    | 24 +++++-----
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 13d1ff39ef..49e21334ca 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -36,28 +36,34 @@ namespace osu.Game.Screens.Backgrounds
 
                 beatmap = value;
 
-                Schedule(() =>
-                {
-                    LoadComponentAsync(new BeatmapBackground(beatmap), b => Schedule(() =>
-                    {
-                        float newDepth = 0;
-                        if (Background != null)
-                        {
-                            newDepth = Background.Depth + 1;
-                            Background.FinishTransforms();
-                            Background.FadeOut(250);
-                            Background.Expire();
-                        }
-
-                        b.Depth = newDepth;
-                        fadeContainer.Add(Background = b);
-                        Background.BlurSigma = BlurTarget;
-                        StoryboardReplacesBackground.BindTo(fadeContainer.StoryboardReplacesBackground);
-                    }));
-                });
+                Schedule(() => { LoadComponentAsync(new BeatmapBackground(beatmap), b => Schedule(() => backgroundLoaded(b))); });
             }
         }
 
+        private void backgroundLoaded(BeatmapBackground b)
+        {
+            float newDepth = 0;
+            if (Background != null)
+            {
+                newDepth = Background.Depth + 1;
+                Background.FinishTransforms();
+                Background.FadeOut(250);
+                Background.Expire();
+            }
+
+            b.Depth = newDepth;
+            fadeContainer.Add(Background = b);
+            Background.BlurSigma = BlurTarget;
+            StoryboardReplacesBackground.BindTo(fadeContainer.StoryboardReplacesBackground);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (beatmap != null)
+                backgroundLoaded(new BeatmapBackground(beatmap));
+        }
+
         public BackgroundScreenBeatmap(WorkingBeatmap beatmap = null)
         {
             Beatmap = beatmap;
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 87a6b5d591..e015f95ff8 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Backgrounds
 
             currentDisplay = RNG.Next(0, background_count);
 
-            Next();
+            display(createBackground());
         }
 
         private void display(Background newBackground)
@@ -51,19 +51,21 @@ namespace osu.Game.Screens.Backgrounds
         public void Next()
         {
             nextTask?.Cancel();
-            nextTask = Scheduler.AddDelayed(() =>
-            {
-                Background background;
+            nextTask = Scheduler.AddDelayed(() => { LoadComponentAsync(createBackground(), display); }, 100);
+        }
 
-                if (user.Value?.IsSupporter ?? false)
-                    background = new SkinnedBackground(skin.Value, backgroundName);
-                else
-                    background = new Background(backgroundName);
+        private Background createBackground()
+        {
+            Background background;
 
-                background.Depth = currentDisplay;
+            if (user.Value?.IsSupporter ?? false)
+                background = new SkinnedBackground(skin.Value, backgroundName);
+            else
+                background = new Background(backgroundName);
 
-                LoadComponentAsync(background, display);
-            }, 100);
+            background.Depth = currentDisplay;
+
+            return background;
         }
 
         private class SkinnedBackground : Background