From b942192e004c95891e02048d007077836c51f9b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Aug 2019 15:04:04 +0900
Subject: [PATCH] Fix remaining nullref

---
 osu.Game/Overlays/NowPlayingOverlay.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index f14adcb53d..a3243a655e 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -247,13 +247,6 @@ namespace osu.Game.Overlays
             }
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            musicController.TrackChanged -= trackChanged;
-        }
-
         private Action pendingBeatmapSwitch;
 
         private void trackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction = TrackChangeDirection.None)
@@ -313,6 +306,14 @@ namespace osu.Game.Overlays
             playlistButton.Enabled.Value = !disabled;
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (musicController != null)
+                musicController.TrackChanged -= trackChanged;
+        }
+
         private class MusicIconButton : IconButton
         {
             public MusicIconButton()