From b6fb7a0d39e6a5667be3fa45d90a3f2a5072d5ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 7 Aug 2020 22:05:58 +0900
Subject: [PATCH] Fix possibly setting null track

---
 .../Visual/Online/TestSceneNowPlayingCommand.cs           | 2 +-
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs                  | 3 ++-
 osu.Game/Overlays/MusicController.cs                      | 8 +++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
index 103308d34d..9662bd65b4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("Set activity", () => API.Activity.Value = new UserActivity.InLobby());
 
-            AddStep("Set beatmap", () => Beatmap.Value = new DummyWorkingBeatmap(null, null)
+            AddStep("Set beatmap", () => Beatmap.Value = new DummyWorkingBeatmap(Audio, null)
             {
                 BeatmapInfo = { OnlineBeatmapID = hasOnlineId ? 1234 : (int?)null }
             });
diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index 8080e94075..ca801cf745 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -19,7 +20,7 @@ namespace osu.Game.Beatmaps
     {
         private readonly TextureStore textures;
 
-        public DummyWorkingBeatmap(AudioManager audio, TextureStore textures)
+        public DummyWorkingBeatmap([NotNull] AudioManager audio, TextureStore textures)
             : base(new BeatmapInfo
             {
                 Metadata = new BeatmapMetadata
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 3e93ae2ccd..2aed46a1d0 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -321,15 +321,13 @@ namespace osu.Game.Overlays
         private void changeTrack()
         {
             CurrentTrack.Expire();
-            CurrentTrack = null;
+            CurrentTrack = new DrawableTrack(new TrackVirtual(1000));
 
             if (current != null)
-            {
                 CurrentTrack = new DrawableTrack(current.GetRealTrack());
-                CurrentTrack.Completed += () => onTrackCompleted(current);
 
-                AddInternal(CurrentTrack);
-            }
+            CurrentTrack.Completed += () => onTrackCompleted(current);
+            AddInternal(CurrentTrack);
         }
 
         private void onTrackCompleted(WorkingBeatmap workingBeatmap)