From d11b896148508b3e1555982c64ee44ed20b4ff29 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Aug 2019 20:21:00 +0900
Subject: [PATCH] Move FrameStablePlayback handling to early return

---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 66ba6f7e64..25fe5cdd96 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -118,7 +118,14 @@ private void updateClock()
 
             try
             {
-                if (firstConsumption)
+                if (!FrameStablePlayback)
+                {
+                    manualClock.CurrentTime = newProposedTime;
+                    requireMoreUpdateLoops = false;
+                    return;
+                }
+
+                else if (firstConsumption)
                 {
                     // On the first update, frame-stability seeking would result in unexpected/unwanted behaviour.
                     // Instead we perform an initial seek to the proposed time.
@@ -138,7 +145,7 @@ private void updateClock()
                         : Math.Max(newProposedTime, manualClock.CurrentTime - sixty_frame_time);
                 }
 
-                if (!isAttached || !FrameStablePlayback)
+                if (!isAttached)
                 {
                     manualClock.CurrentTime = newProposedTime;
                 }