From 0a81fdbd10075f7220a0354c259313e0e5e54f1e Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Mon, 30 Jan 2017 09:44:02 -0500
Subject: [PATCH] Update null background handling

---
 osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs | 11 ++++++-----
 osu.Game/Screens/Select/PlaySongSelect.cs             |  9 +++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs
index b5a2332f7f..250b789511 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs
@@ -24,14 +24,17 @@ namespace osu.Game.Screens.Backgrounds
             }
             set
             {
-                if (beatmap == value)
+                if (beatmap == value && beatmap != null)
                     return;
-
                 beatmap = value;
 
                 Schedule(() =>
                 {
-                    Background newBackground = new BeatmapBackground(beatmap);
+                    Background newBackground;
+                    if (beatmap == null)
+                        newBackground = new Background(@"Backgrounds/bg1");
+                    else
+                        newBackground = new BeatmapBackground(beatmap);
 
                     newBackground.Preload(Game, delegate
                     {
@@ -55,8 +58,6 @@ namespace osu.Game.Screens.Backgrounds
         public BackgroundModeBeatmap(WorkingBeatmap beatmap)
         {
             Beatmap = beatmap;
-            if (beatmap == null)
-                Add(background = new Background(@"Backgrounds/bg1"));
         }
 
         public void BlurTo(Vector2 sigma, double duration)
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index ddacf7c4b2..edfe1bc3a5 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -298,18 +298,15 @@ namespace osu.Game.Screens.Select
 
         private void changeBackground(WorkingBeatmap beatmap)
         {
-            if (beatmap == null)
-                return;
-
             var backgroundModeBeatmap = Background as BackgroundModeBeatmap;
             if (backgroundModeBeatmap != null)
             {
                 backgroundModeBeatmap.Beatmap = beatmap;
-                // TODO: Remove this once we have non-nullable Beatmap
-                (Background as BackgroundModeBeatmap)?.BlurTo(BACKGROUND_BLUR, 1000);
+                backgroundModeBeatmap.BlurTo(BACKGROUND_BLUR, 1000);
             }
 
-            beatmapInfoWedge.UpdateBeatmap(beatmap);
+            if (beatmap != null)
+                beatmapInfoWedge.UpdateBeatmap(beatmap);
         }
 
         /// <summary>