From 7d35893ecd2bf8b277c2e6ac9632592dbf313f6f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 Aug 2020 12:40:58 +0900
Subject: [PATCH] Make MusicController non-nullable

---
 osu.Game/Screens/Menu/MainMenu.cs             |  2 +-
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         | 28 +++++++------------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 8837a49772..470e8ca9a6 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private GameHost host { get; set; }
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private MusicController music { get; set; }
 
         [Resolved(canBeNull: true)]
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index ff7d56a95b..f9c5fd13a4 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Lounge
         [Resolved]
         private Bindable<Room> selectedRoom { get; set; }
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private MusicController music { get; set; }
 
         private bool joiningRoom;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 80ed894233..ddbb021054 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -99,7 +99,7 @@ namespace osu.Game.Screens.Select
 
         private readonly Bindable<RulesetInfo> decoupledRuleset = new Bindable<RulesetInfo>();
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader(true)]
@@ -561,18 +561,15 @@ namespace osu.Game.Screens.Select
 
             BeatmapDetails.Refresh();
 
-            if (music?.CurrentTrack != null)
-            {
-                music.CurrentTrack.Looping = true;
-                music.ResetTrackAdjustments();
-            }
+            music.CurrentTrack.Looping = true;
+            music.ResetTrackAdjustments();
 
             if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
             {
                 updateComponentFromBeatmap(Beatmap.Value);
 
                 // restart playback on returning to song select, regardless.
-                music?.Play();
+                music.Play();
             }
 
             this.FadeIn(250);
@@ -589,8 +586,7 @@ namespace osu.Game.Screens.Select
 
             BeatmapOptions.Hide();
 
-            if (music?.CurrentTrack != null)
-                music.CurrentTrack.Looping = false;
+            music.CurrentTrack.Looping = false;
 
             this.ScaleTo(1.1f, 250, Easing.InSine);
 
@@ -611,8 +607,7 @@ namespace osu.Game.Screens.Select
 
             FilterControl.Deactivate();
 
-            if (music?.CurrentTrack != null)
-                music.CurrentTrack.Looping = false;
+            music.CurrentTrack.Looping = false;
 
             return false;
         }
@@ -653,8 +648,7 @@ namespace osu.Game.Screens.Select
 
             BeatmapDetails.Beatmap = beatmap;
 
-            if (music?.CurrentTrack != null)
-                music.CurrentTrack.Looping = true;
+            music.CurrentTrack.Looping = true;
         }
 
         private readonly WeakReference<ITrack> lastTrack = new WeakReference<ITrack>(null);
@@ -665,16 +659,14 @@ namespace osu.Game.Screens.Select
         /// </summary>
         private void ensurePlayingSelected()
         {
-            ITrack track = music?.CurrentTrack;
-            if (track == null)
-                return;
+            ITrack track = music.CurrentTrack;
 
             bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track;
 
             track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
 
-            if (!track.IsRunning && (music?.IsUserPaused != true || isNewTrack))
-                music?.Play(true);
+            if (!track.IsRunning && (music.IsUserPaused != true || isNewTrack))
+                music.Play(true);
 
             lastTrack.SetTarget(track);
         }