From 24ba21363e0d7501c2bf0990387e86240e04be63 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Feb 2017 21:37:34 +0900
Subject: [PATCH] Make intro->mainmenu work better by delaying interactiveness
 of osu! logo.

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 2 ++
 osu.Game/Screens/Menu/MainMenu.cs     | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index c6d515f303..15d64a0766 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -288,6 +288,8 @@ namespace osu.Game.Screens.Menu
             //if (OsuGame.IdleTime > 6000 && State != MenuState.Exit)
             //    State = MenuState.Initial;
 
+            osuLogo.Interactive = Alpha >= 0.8f;
+
             iconFacade.Width = osuLogo.SizeForFlow * 0.5f;
             base.Update();
         }
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 258e20a8bd..9a715c17be 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -65,9 +65,10 @@ namespace osu.Game.Screens.Menu
             buttons.OnSettings = game.ToggleOptions;
         }
 
-        protected override void LoadComplete()
+        protected override void OnEntering(GameMode last)
         {
-            base.LoadComplete();
+
+            base.OnEntering(last);
             buttons.FadeInFromZero(500);
         }