From 6819c528db75c4d88f75ab35c837f1f3e81e13bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Jul 2019 00:20:01 +0900
Subject: [PATCH] Use canBeNull instead of needlessly caching MusicController
 for tests

---
 osu.Game/Screens/Menu/MainMenu.cs     | 6 +++---
 osu.Game/Screens/Select/SongSelect.cs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 93c413452d..5999cbdfb5 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -42,8 +42,8 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private GameHost host { get; set; }
 
-        [Resolved]
-        private MusicController musicController { get; set; }
+        [Resolved(canBeNull: true)]
+        private MusicController music { get; set; }
 
         private BackgroundScreenDefault background;
 
@@ -193,7 +193,7 @@ namespace osu.Game.Screens.Menu
             //we may have consumed our preloaded instance, so let's make another.
             preloadSongSelect();
 
-            if (Beatmap.Value.Track != null && !musicController.IsUserPaused)
+            if (Beatmap.Value.Track != null && music?.IsUserPaused != true)
                 Beatmap.Value.Track.Start();
         }
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 085232b27f..0eeffda5eb 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -87,8 +87,8 @@ namespace osu.Game.Screens.Select
 
         private readonly Bindable<RulesetInfo> decoupledRuleset = new Bindable<RulesetInfo>();
 
-        [Resolved]
-        private MusicController musicController { get; set; }
+        [Resolved(canBeNull: true)]
+        private MusicController music { get; set; }
 
         [Cached]
         [Cached(Type = typeof(IBindable<IReadOnlyList<Mod>>))]
@@ -573,7 +573,7 @@ namespace osu.Game.Screens.Select
         {
             Track track = Beatmap.Value.Track;
 
-            if ((!track.IsRunning || restart) && !musicController.IsUserPaused)
+            if ((!track.IsRunning || restart) && music?.IsUserPaused != true)
             {
                 track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
                 track.Restart();