From 3eb1cda6aab101637516a5027311c3264858f3dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Aug 2022 01:40:12 +0900
Subject: [PATCH] Reorganise call order of `Start` / `Reset` to make more sense

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 8770c58430..9f13d15890 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -89,22 +89,22 @@ namespace osu.Game.Screens.Play
         }
 
         /// <summary>
-        /// Starts gameplay.
+        /// Starts gameplay and marks un-paused state.
         /// </summary>
         public virtual void Start()
         {
             ensureSourceClockSet();
 
+            isPaused.Value = false;
+
+            // the clock may be stopped via internal means (ie. not via `IsPaused`).
             if (!GameplayClock.IsRunning)
             {
                 // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
                 // This accounts for the clock source potentially taking time to enter a completely stopped state
                 Seek(GameplayClock.CurrentTime);
-
                 GameplayClock.Start();
             }
-
-            isPaused.Value = false;
         }
 
         /// <summary>
@@ -121,7 +121,7 @@ namespace osu.Game.Screens.Play
         }
 
         /// <summary>
-        /// Stops gameplay.
+        /// Stops gameplay and marks paused state.
         /// </summary>
         public void Stop() => isPaused.Value = true;
 
@@ -134,11 +134,11 @@ namespace osu.Game.Screens.Play
             // Manually stop the source in order to not affect the IsPaused state.
             GameplayClock.Stop();
 
-            if (!IsPaused.Value || startClock)
-                Start();
-
             ensureSourceClockSet();
             Seek(StartTime);
+
+            if (!IsPaused.Value || startClock)
+                Start();
         }
 
         /// <summary>