From acbf4580a412772b6be6d8e3d60446bbe35b9003 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 19:55:59 +0900
Subject: [PATCH] Only set initial source in Reset()

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 17 +++++++++++++++--
 .../Play/MasterGameplayClockContainer.cs        |  4 ++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index ee65384bc9..3da28f3560 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -29,17 +29,22 @@ public abstract class GameplayClockContainer : Container
         /// </summary>
         protected readonly DecoupleableInterpolatingFramedClock AdjustableSource;
 
+        /// <summary>
+        /// The source clock.
+        /// </summary>
+        protected IClock SourceClock { get; private set; }
+
         /// <summary>
         /// Creates a new <see cref="GameplayClockContainer"/>.
         /// </summary>
         /// <param name="sourceClock">The source <see cref="IClock"/> used for timing.</param>
         protected GameplayClockContainer(IClock sourceClock)
         {
+            SourceClock = sourceClock;
+
             RelativeSizeAxes = Axes.Both;
 
             AdjustableSource = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
-            AdjustableSource.ChangeSource(sourceClock);
-
             IsPaused.BindValueChanged(OnIsPausedChanged);
         }
 
@@ -86,6 +91,8 @@ public virtual void Start()
         /// </summary>
         public virtual void Reset()
         {
+            ChangeSource(SourceClock);
+
             AdjustableSource.Seek(0);
             AdjustableSource.Stop();
 
@@ -93,6 +100,12 @@ public virtual void Reset()
                 Start();
         }
 
+        /// <summary>
+        /// Changes the source clock.
+        /// </summary>
+        /// <param name="sourceClock">The new source.</param>
+        protected void ChangeSource(IClock sourceClock) => AdjustableSource.ChangeSource(SourceClock = sourceClock);
+
         protected override void Update()
         {
             if (!IsPaused.Value)
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 5ea50cbdc7..f019e50b60 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -33,7 +33,7 @@ public class MasterGameplayClockContainer : GameplayClockContainer
         /// </summary>
         public const double MINIMUM_SKIP_TIME = 1000;
 
-        protected Track Track => (Track)AdjustableSource.Source;
+        protected Track Track => (Track)SourceClock;
 
         public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
         {
@@ -164,7 +164,7 @@ protected override GameplayClock CreateGameplayClock(IFrameBasedClock source)
         public void StopUsingBeatmapClock()
         {
             removeSourceClockAdjustments();
-            AdjustableSource.ChangeSource(new TrackVirtual(beatmap.Track.Length));
+            ChangeSource(new TrackVirtual(beatmap.Track.Length));
         }
 
         private bool speedAdjustmentsApplied;