From 651706b10e4ba85bea3faba3ccf70c2736cbf5aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Mar 2019 16:17:20 +0900
Subject: [PATCH] Account for user/system offsets when deciding on an initial
 seek time

Closes #3043
Remove "AllowLeadIn" flag
---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index c151e598f7..f6a23575e9 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -26,6 +26,10 @@ namespace osu.Game.Screens.Play
         private readonly WorkingBeatmap beatmap;
         private readonly IReadOnlyList<Mod> mods;
 
+        private readonly bool allowLeadIn;
+
+        private readonly double gameplayStartTime;
+
         /// <summary>
         /// The original source (usually a <see cref="WorkingBeatmap"/>'s track).
         /// </summary>
@@ -60,6 +64,8 @@ namespace osu.Game.Screens.Play
 
         private readonly FramedOffsetClock platformOffsetClock;
 
+        private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
+
         public GameplayClockContainer(WorkingBeatmap beatmap, IReadOnlyList<Mod> mods, double gameplayStartTime)
         {
             this.beatmap = beatmap;
@@ -93,6 +99,9 @@ namespace osu.Game.Screens.Play
             userAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);
             userAudioOffset.BindValueChanged(offset => userOffsetClock.Offset = offset.NewValue, true);
 
+            adjustableClock.Seek(Math.Min(0, gameplayStartTime - totalOffset - (allowLeadIn ? beatmap.BeatmapInfo.AudioLeadIn : 0)));
+            adjustableClock.ProcessFrame();
+
             UserPlaybackRate.ValueChanged += _ => updateRate();
 
             Seek(Math.Min(-beatmap.BeatmapInfo.AudioLeadIn, gameplayStartTime));