From c2d1de34fccff8b98bff003662a907c89df99796 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 18 Nov 2017 11:19:15 +0900
Subject: [PATCH] Fix logo not always returning to the correct state when
 rapidly changing menus

Fixes #1005 for real
---
 osu.Game/Screens/Menu/ButtonSystem.cs | 44 +++++++++++++++------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 1b2b6a4d11..844b1e1819 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -17,6 +17,7 @@
 using OpenTK.Input;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Audio;
+using osu.Framework.Threading;
 
 namespace osu.Game.Screens.Menu
 {
@@ -281,25 +282,30 @@ public MenuState State
             }
         }
 
+        private ScheduledDelegate logoDelayedAction;
+
         private void updateLogoState(MenuState lastState = MenuState.Initial)
         {
+            if (logo == null) return;
+
+            logoDelayedAction?.Cancel();
+
             switch (state)
             {
                 case MenuState.Exit:
                 case MenuState.Initial:
                     logoTracking = false;
 
-                    logo?.Delay(150)
-                        .Schedule(() =>
-                        {
-                            toolbar?.Hide();
+                    logoDelayedAction = Scheduler.AddDelayed(() =>
+                    {
+                        toolbar?.Hide();
 
-                            logo.ClearTransforms(targetMember: nameof(Position));
-                            logo.RelativePositionAxes = Axes.Both;
+                        logo.ClearTransforms(targetMember: nameof(Position));
+                        logo.RelativePositionAxes = Axes.Both;
 
-                            logo.MoveTo(new Vector2(0.5f), 800, Easing.OutExpo);
-                            logo.ScaleTo(1, 800, Easing.OutExpo);
-                        });
+                        logo.MoveTo(new Vector2(0.5f), 800, Easing.OutExpo);
+                        logo.ScaleTo(1, 800, Easing.OutExpo);
+                    }, 150);
 
                     break;
                 case MenuState.TopLevel:
@@ -307,26 +313,24 @@ private void updateLogoState(MenuState lastState = MenuState.Initial)
                     logo.ClearTransforms(targetMember: nameof(Position));
                     logo.RelativePositionAxes = Axes.None;
 
-                    logoTracking = true;
-
                     switch (lastState)
                     {
                         case MenuState.Initial:
+                            logoTracking = false;
                             logo.ScaleTo(0.5f, 200, Easing.In);
 
-                            logoTracking = false;
+                            logo.MoveTo(logoTrackingPosition, lastState == MenuState.EnteringMode ? 0 : 200, Easing.In);
 
-                            logo
-                                .MoveTo(logoTrackingPosition, lastState == MenuState.EnteringMode ? 0 : 200, Easing.In)
-                                .OnComplete(o =>
-                                {
-                                    logoTracking = true;
+                            logoDelayedAction = Scheduler.AddDelayed(() =>
+                            {
+                                logoTracking = true;
 
-                                    o.Impact();
-                                    toolbar?.Show();
-                                });
+                                logo.Impact();
+                                toolbar?.Show();
+                            }, 200);
                             break;
                         default:
+                            logoTracking = true;
                             logo.ScaleTo(0.5f, 200, Easing.OutQuint);
                             break;
                     }