From 4d2a677080beaed2a64c6ece28c663cf4d9f3aff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jul 2020 20:33:18 +0900
Subject: [PATCH] Fix next track starting before previous one is paused

Closes #9651.
---
 osu.Game/Overlays/MusicController.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 546f7a1ec4..212d4d4850 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -262,7 +262,11 @@ namespace osu.Game.Overlays
             {
                 if (beatmap is Bindable<WorkingBeatmap> working)
                     working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
-                beatmap.Value.Track.Restart();
+
+                // if not scheduled, the previously track will be stopped one frame later (see ScheduleAfterChildren logic in GameBase).
+                // we probably want to move this to a central method for switching to a new working beatmap in the future.
+                Schedule(() => beatmap.Value.Track.Restart());
+
                 return true;
             }