From 1d6c321e14ff3c820ae2f3578f62e239cacbdd18 Mon Sep 17 00:00:00 2001
From: Shane Woolcock <samahnub@gmail.com>
Date: Fri, 26 Jul 2019 08:34:18 +0930
Subject: [PATCH] Ensure we don't ping-pong nearestBreakIndex between breaks

---
 osu.Game/Screens/Play/BreakOverlay.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/BreakOverlay.cs b/osu.Game/Screens/Play/BreakOverlay.cs
index aceacdbab1..50b2c97f59 100644
--- a/osu.Game/Screens/Play/BreakOverlay.cs
+++ b/osu.Game/Screens/Play/BreakOverlay.cs
@@ -136,11 +136,16 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            while (nearestBreakIndex < breaks.Count - 1 && Clock.CurrentTime > breaks[nearestBreakIndex].EndTime)
-                nearestBreakIndex++;
-
-            while (nearestBreakIndex > 0 && Clock.CurrentTime < breaks[nearestBreakIndex].StartTime)
-                nearestBreakIndex--;
+            if (Clock.CurrentTime > breaks[nearestBreakIndex].EndTime)
+            {
+                while (nearestBreakIndex < breaks.Count - 1 && Clock.CurrentTime > breaks[nearestBreakIndex].EndTime)
+                    nearestBreakIndex++;
+            }
+            else
+            {
+                while (nearestBreakIndex > 0 && Clock.CurrentTime < breaks[nearestBreakIndex].StartTime)
+                    nearestBreakIndex--;
+            }
 
             // This ensures that IsBreakTime is generally consistent with the overlay's transforms during a break.
             // If the overlay never shows (break.HasEffect is false), IsBreakTime should be false.