From 8222923ab8838cf754874df7edbe62fa37679291 Mon Sep 17 00:00:00 2001
From: David Zhao <nyquill@ppy.sh>
Date: Wed, 24 Apr 2019 16:20:51 +0900
Subject: [PATCH] Only track logo if we're still the current screen

---
 osu.Game/Screens/Play/PlayerLoader.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 6a55fe278b..4403cae883 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -163,7 +163,11 @@ protected override void LogoArriving(OsuLogo logo, bool resuming)
             logo.ScaleTo(new Vector2(0.15f), duration, Easing.In);
             logo.FadeIn(350);
 
-            Scheduler.AddDelayed(() => { content.StartTracking(logo, resuming ? 0 : 500, Easing.InOutExpo); }, resuming ? 0 : 500);
+            Scheduler.AddDelayed(() =>
+            {
+                if (this.IsCurrentScreen())
+                    content.StartTracking(logo, resuming ? 0 : 500, Easing.InOutExpo);
+            }, resuming ? 0 : 500);
         }
 
         protected override void LogoExiting(OsuLogo logo)