From 1f00793891e1488151e7817edd99cbd9a362dfd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Aug 2019 11:30:04 +0900
Subject: [PATCH] Unpause music when changing selection at song select

---
 osu.Game/Overlays/MusicController.cs  |  9 +++++++++
 osu.Game/Screens/Select/SongSelect.cs | 13 +++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index f6208c46cb..6ad147735b 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -92,6 +92,15 @@ namespace osu.Game.Overlays
             });
         }
 
+        /// <summary>
+        /// Start playing the current track (if not already playing).
+        /// </summary>
+        public void Play()
+        {
+            if (!IsPlaying)
+                TogglePause();
+        }
+
         /// <summary>
         /// Toggle pause / play.
         /// </summary>
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 8340814db9..edb0e6deb8 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -359,6 +359,7 @@ namespace osu.Game.Screens.Select
                 return;
 
             beatmapNoDebounce = beatmap;
+
             performUpdateSelected();
         }
 
@@ -586,10 +587,18 @@ namespace osu.Game.Screens.Select
         {
             Track track = Beatmap.Value.Track;
 
-            if ((!track.IsRunning || restart) && music?.IsUserPaused != true)
+            if (!track.IsRunning || restart)
             {
                 track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-                track.Restart();
+
+                if (music != null)
+                {
+                    // use the global music controller (when available) to cancel a potential local user paused state.
+                    music.SeekTo(track.RestartPoint);
+                    music.Play();
+                }
+                else
+                    track.Restart();
             }
         }