From 4cf4a6685802831dee21b6d0cc0047c453ec608b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 15 Jan 2023 22:43:30 +0900
Subject: [PATCH] Make `MusicController` a required dependency of `SongSelect`

---
 osu.Game/Screens/Select/SongSelect.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 0e108d3db0..d7c1dbf543 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -34,6 +34,7 @@ using osu.Framework.Input.Bindings;
 using osu.Game.Collections;
 using osu.Game.Graphics.UserInterface;
 using System.Diagnostics;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 
@@ -118,7 +119,7 @@ namespace osu.Game.Screens.Select
         private IDisposable? modSelectOverlayRegistration;
 
         [Resolved]
-        private MusicController? music { get; set; }
+        private MusicController music { get; set; } = null!;
 
         [Resolved]
         internal IOverlayManager? OverlayManager { get; private set; }
@@ -616,7 +617,6 @@ namespace osu.Game.Screens.Select
                 {
                     // restart playback on returning to song select, regardless.
                     // not sure this should be a permanent thing (we may want to leave a user pause paused even on returning)
-                    Debug.Assert(music != null);
                     music.ResetTrackAdjustments();
                     music.Play(requestedByUser: true);
                 }
@@ -692,7 +692,6 @@ namespace osu.Game.Screens.Select
 
             ensureTrackLooping(Beatmap.Value, TrackChangeDirection.None);
 
-            Debug.Assert(music != null);
             music.TrackChanged += ensureTrackLooping;
         }
 
@@ -702,7 +701,6 @@ namespace osu.Game.Screens.Select
             if (!isHandlingLooping)
                 return;
 
-            Debug.Assert(music != null);
             music.CurrentTrack.Looping = isHandlingLooping = false;
 
             music.TrackChanged -= ensureTrackLooping;
@@ -728,7 +726,7 @@ namespace osu.Game.Screens.Select
 
             decoupledRuleset.UnbindAll();
 
-            if (music != null)
+            if (music.IsNotNull())
                 music.TrackChanged -= ensureTrackLooping;
 
             modSelectOverlayRegistration?.Dispose();
@@ -774,7 +772,6 @@ namespace osu.Game.Screens.Select
             if (!ControlGlobalMusic)
                 return;
 
-            Debug.Assert(music != null);
             ITrack track = music.CurrentTrack;
 
             bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track;