From 21984ba7644142b0edce914fb38e75aefe191d10 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Jul 2017 17:44:45 +0900
Subject: [PATCH] Move DummyWorkingBeatmap to a more global level (OsuScreen)

---
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs    | 3 ++-
 osu.Game/Screens/OsuScreen.cs               | 2 +-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 3 ---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index 2226d63189..267198c94c 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Beatmaps
                     Title = "no beatmaps available!",
                     Author = "no one",
                 },
+                BeatmapSet = new BeatmapSetInfo(),
                 Difficulty = new BeatmapDifficulty(),
             })
         {
@@ -32,6 +33,6 @@ namespace osu.Game.Beatmaps
 
         protected override Texture GetBackground() => null;
 
-        protected override Track GetTrack() => null;
+        protected override Track GetTrack() => new TrackVirtual();
     }
 }
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 64223db100..cf03fcd845 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens
             }
             set
             {
-                beatmap.Value = value;
+                beatmap.Value = value ?? new DummyWorkingBeatmap();
             }
         }
 
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 518e799980..7dfe39e141 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -71,9 +71,6 @@ namespace osu.Game.Screens.Select
 
         public void UpdateBeatmap(WorkingBeatmap beatmap)
         {
-            if (beatmap == null)
-                beatmap = new DummyWorkingBeatmap();
-
             var lastContainer = beatmapInfoContainer;
             float newDepth = lastContainer?.Depth + 1 ?? 0;