From ea649f96504a72be9ebbcc55c2f70b6dd32e563b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Mar 2018 12:01:15 +0900
Subject: [PATCH] Avoid scheduling during non-current screen

---
 osu.Game/Screens/Play/PlayerLoader.cs | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index cdb6f36a6f..31e7313c0b 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -131,16 +131,22 @@ namespace osu.Game.Screens.Play
 
         private void pushWhenLoaded()
         {
-            Schedule(pushWhenLoaded);
+            if (!IsCurrentScreen) return;
 
-            if (!readyForPush)
+            try
             {
-                pushDebounce?.Cancel();
-                pushDebounce = null;
-                return;
-            }
+                if (!readyForPush)
+                {
+                    // as the pushDebounce below has a delay, we need to keep checking and cancel a future debounce
+                    // if we become unready for push during the delay.
+                    pushDebounce?.Cancel();
+                    pushDebounce = null;
+                    return;
+                }
+
+                if (pushDebounce != null)
+                    return;
 
-            if (pushDebounce == null)
                 pushDebounce = Scheduler.AddDelayed(() =>
                 {
                     contentOut();
@@ -159,6 +165,11 @@ namespace osu.Game.Screens.Play
                         }
                     });
                 }, 500);
+            }
+            finally
+            {
+                Schedule(pushWhenLoaded);
+            }
         }
 
         protected override bool OnExiting(Screen next)