From 8dd9134e3d9b6304c3a3ad8d4f869ea73394d42e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 13:09:49 +0900
Subject: [PATCH] Move source clock adjustment application to Start()

---
 .../Screens/Play/MasterGameplayClockContainer.cs  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 05d34fb8d4..f1d303e245 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -105,6 +105,12 @@ namespace osu.Game.Screens.Play
                 this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
         }
 
+        public override void Start()
+        {
+            addSourceClockAdjustments();
+            base.Start();
+        }
+
         /// <summary>
         /// Seek to a specific time in gameplay.
         /// </summary>
@@ -122,12 +128,6 @@ namespace osu.Game.Screens.Play
             userOffsetClock.ProcessFrame();
         }
 
-        public override void Reset()
-        {
-            updateRate();
-            base.Reset();
-        }
-
         /// <summary>
         /// Skip forward to the next valid skip point.
         /// </summary>
@@ -164,11 +164,12 @@ namespace osu.Game.Screens.Play
         {
             removeSourceClockAdjustments();
             ChangeSource(new TrackVirtual(beatmap.Track.Length));
+            addSourceClockAdjustments();
         }
 
         private bool speedAdjustmentsApplied;
 
-        private void updateRate()
+        private void addSourceClockAdjustments()
         {
             if (speedAdjustmentsApplied)
                 return;