From 449e53ee6d5c57db401884b9924eb4d5158dda20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Oct 2019 12:03:42 +0900
Subject: [PATCH] Centralise track handling

---
 osu.Game/Screens/Menu/IntroCircles.cs   | 12 +-----------
 osu.Game/Screens/Menu/IntroScreen.cs    | 18 +++++++++++++++++-
 osu.Game/Screens/Menu/IntroTriangles.cs | 13 +------------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index 6c643860a0..8f3b4f43c5 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -30,19 +30,11 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
-                Beatmap.Value = IntroBeatmap;
-                IntroBeatmap = null;
-
                 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 Menu.
-                    if (MenuMusic.Value)
-                    {
-                        Track.Restart();
-                        Track = null;
-                    }
+                    StartTrack();
 
                     PrepareMenuLoad();
 
@@ -57,8 +49,6 @@ namespace osu.Game.Screens.Menu
 
         public override void OnSuspending(IScreen next)
         {
-            Track = null;
-
             this.FadeOut(300);
             base.OnSuspending(next);
         }
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 5d560c0c2a..c00d105e12 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Menu
 
         protected Bindable<bool> MenuMusic;
 
-        protected Track Track;
+        protected Track Track { get; private set; }
 
         protected WorkingBeatmap IntroBeatmap;
 
@@ -57,6 +57,13 @@ namespace osu.Game.Screens.Menu
 
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
 
+        protected void StartTrack()
+        {
+            // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
+            if (MenuMusic.Value)
+                Track.Restart();
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, SkinManager skinManager, BeatmapManager beatmaps, Framework.Game game)
         {
@@ -136,6 +143,9 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
+                Beatmap.Value = IntroBeatmap;
+                IntroBeatmap = null;
+
                 logo.MoveTo(new Vector2(0.5f));
                 logo.ScaleTo(Vector2.One);
                 logo.Hide();
@@ -156,6 +166,12 @@ namespace osu.Game.Screens.Menu
             }
         }
 
+        public override void OnSuspending(IScreen next)
+        {
+            base.OnSuspending(next);
+            Track = null;
+        }
+
         private MainMenu mainMenu;
 
         protected void PrepareMenuLoad()
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 590069ab43..08941eca37 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -55,9 +55,6 @@ namespace osu.Game.Screens.Menu
 
             if (!resuming)
             {
-                Beatmap.Value = IntroBeatmap;
-                IntroBeatmap = null;
-
                 PrepareMenuLoad();
 
                 LoadComponentAsync(new TrianglesIntroSequence(logo, background)
@@ -70,9 +67,7 @@ namespace osu.Game.Screens.Menu
                     AddInternal(t);
                     Welcome?.Play();
 
-                    // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
-                    if (MenuMusic.Value)
-                        Track.Start();
+                    StartTrack();
                 });
             }
         }
@@ -83,12 +78,6 @@ namespace osu.Game.Screens.Menu
             background.FadeOut(100);
         }
 
-        public override void OnSuspending(IScreen next)
-        {
-            Track = null;
-            base.OnSuspending(next);
-        }
-
         private class TrianglesIntroSequence : CompositeDrawable
         {
             private readonly OsuLogo logo;