From 9ea6ab28ea45ce90de2471f22a1b20de8ce44b5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 May 2018 20:21:53 +0900
Subject: [PATCH] Fix intro potentially starting out-of-sync due to logo's
 outward animation

---
 osu.Game/Screens/Menu/Intro.cs | 48 ++++++++++++++++------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs
index c174e2d470..5aca184d24 100644
--- a/osu.Game/Screens/Menu/Intro.cs
+++ b/osu.Game/Screens/Menu/Intro.cs
@@ -79,31 +79,6 @@ namespace osu.Game.Screens.Menu
             seeya = audio.Sample.Get(@"seeya");
         }
 
-        protected override void OnEntering(Screen last)
-        {
-            base.OnEntering(last);
-
-            Game.Beatmap.Value = beatmap;
-
-            if (menuVoice)
-                welcome.Play();
-
-            Scheduler.AddDelayed(delegate
-            {
-                // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Manu.
-                if (menuMusic)
-                    track.Start();
-
-                LoadComponentAsync(mainMenu = new MainMenu());
-
-                Scheduler.AddDelayed(delegate
-                {
-                    DidLoadMenu = true;
-                    Push(mainMenu);
-                }, delay_step_one);
-            }, delay_step_two);
-        }
-
         private const double delay_step_one = 2300;
         private const double delay_step_two = 600;
 
@@ -113,6 +88,29 @@ namespace osu.Game.Screens.Menu
         {
             base.LogoArriving(logo, resuming);
 
+            if (!resuming)
+            {
+                Game.Beatmap.Value = beatmap;
+
+                if (menuVoice)
+                    welcome.Play();
+
+                Scheduler.AddDelayed(delegate
+                {
+                    // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Manu.
+                    if (menuMusic)
+                        track.Start();
+
+                    LoadComponentAsync(mainMenu = new MainMenu());
+
+                    Scheduler.AddDelayed(delegate
+                    {
+                        DidLoadMenu = true;
+                        Push(mainMenu);
+                    }, delay_step_one);
+                }, delay_step_two);
+            }
+
             logo.RelativePositionAxes = Axes.Both;
             logo.Colour = Color4.White;
             logo.Ripple = false;