From 7b7b92aa10ab0f65f21e338d34d015ed4fe45f6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Jul 2020 17:28:16 +0900
Subject: [PATCH] Fix potential crash when trying to ensure music is playing

---
 osu.Game/Overlays/MusicController.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 09f2a66b47..546f7a1ec4 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Overlays
                 if (beatmap.Disabled)
                     return;
 
-                next();
+                NextTrack();
             }
             else if (!IsPlaying)
             {
@@ -217,6 +217,9 @@ namespace osu.Game.Overlays
         /// <returns>The <see cref="PreviousTrackResult"/> that indicate the decided action.</returns>
         private PreviousTrackResult prev()
         {
+            if (beatmap.Disabled)
+                return PreviousTrackResult.None;
+
             var currentTrackPosition = current?.Track.CurrentTime;
 
             if (currentTrackPosition >= restart_cutoff_point)
@@ -248,6 +251,9 @@ namespace osu.Game.Overlays
 
         private bool next()
         {
+            if (beatmap.Disabled)
+                return false;
+
             queuedDirection = TrackChangeDirection.Next;
 
             var playable = BeatmapSets.SkipWhile(i => i.ID != current.BeatmapSetInfo.ID).ElementAtOrDefault(1) ?? BeatmapSets.FirstOrDefault();