Adjust auto-skip to skip multiple times if necessary

2026-06-07 06:23:39 +08:00 · 2022-11-03 12:05:00 +09:00
parent 5f2f6b84b2
commit 4154be6cda
1 changed files with 18 additions and 9 deletions
@@ -136,20 +136,29 @@ namespace osu.Game.Screens.Play
            };

            fadeContainer.TriggerShow();
-
-            if (skipQueued)
-            {
-                Scheduler.AddDelayed(() => button.TriggerClick(), 200);
-                skipQueued = false;
-            }
        }

+        /// <summary>
+        /// Triggers an "automated" skip to happen as soon as available.
+        /// </summary>
        public void SkipWhenReady()
        {
-            if (IsLoaded)
+            if (skipQueued) return;
+
+            skipQueued = true;
+            attemptNextSkip();
+
+            void attemptNextSkip() => Scheduler.AddDelayed(() =>
+            {
+                if (!button.Enabled.Value)
+                {
+                    skipQueued = false;
+                    return;
+                }
+
                button.TriggerClick();
-            else
-                skipQueued = true;
+                attemptNextSkip();
+            }, 200);
        }

        protected override void Update()