From b0c7b6c7007f48ebe3caad44ded179d50d4dbcac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Sep 2025 18:13:16 +0900
Subject: [PATCH] Fix multiple concerns with new debounce logic

Tried many approaches but this seems simplest to guarantee no test (or
other) regressions..
---
 osu.Game/Screens/SelectV2/SongSelect.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/SelectV2/SongSelect.cs b/osu.Game/Screens/SelectV2/SongSelect.cs
index 64dd92f75b..cc8c6afec2 100644
--- a/osu.Game/Screens/SelectV2/SongSelect.cs
+++ b/osu.Game/Screens/SelectV2/SongSelect.cs
@@ -12,6 +12,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
+using osu.Framework.Development;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -383,7 +384,8 @@ namespace osu.Game.Screens.SelectV2
                 new Dimension(GridSizeMode.Relative, 0.5f, minSize: 500, maxSize: 700 + widescreenBonusWidth * 300),
             };
 
-            updateDebounce();
+            if (this.IsCurrentScreen())
+                updateDebounce();
         }
 
         #region Selection debounce
@@ -401,8 +403,13 @@ namespace osu.Game.Screens.SelectV2
         {
             if (debounceQueuedSelection == null) return;
 
+            double elapsed = Clock.ElapsedFrameTime;
+
             // avoid debounce running early if there's a single long frame.
-            debounceElapsedTime += Math.Min(1000 / Clock.FramesPerSecond, Clock.ElapsedFrameTime);
+            if (!DebugUtils.IsNUnitRunning && Clock.FramesPerSecond > 0)
+                elapsed = Math.Min(1000 / Clock.FramesPerSecond, elapsed);
+
+            debounceElapsedTime += elapsed;
 
             if (debounceElapsedTime >= SELECTION_DEBOUNCE)
                 performDebounceSelection();