From de1ab56a2c28e408879d273fde84c509d91c31cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Aug 2019 14:45:27 +0900
Subject: [PATCH] Fix potential nullref on disposal

---
 osu.Game/Overlays/MusicController.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index d1086d589d..681e318c92 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -197,8 +197,11 @@ namespace osu.Game.Overlays
         {
             base.Dispose(isDisposing);
 
-            beatmaps.ItemAdded -= handleBeatmapAdded;
-            beatmaps.ItemRemoved -= handleBeatmapRemoved;
+            if (beatmaps != null)
+            {
+                beatmaps.ItemAdded -= handleBeatmapAdded;
+                beatmaps.ItemRemoved -= handleBeatmapRemoved;
+            }
         }
     }