From b50ef8ffa4855cecb9ae195accd455669b279feb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Sep 2019 13:15:33 +0800
Subject: [PATCH 1/2] Allow null NotificationManager

---
 osu.Game/Screens/Play/PlayerLoader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 053e11104f..6cde7522d4 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Play
 
         private IdleTracker idleTracker;
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private NotificationOverlay notificationOverlay { get; set; }
 
         [Resolved]
@@ -164,7 +164,7 @@ namespace osu.Game.Screens.Play
             //Checks if the notification has not been shown yet and also if master volume is muted, track/music volume is muted or if the whole game is muted.
             if (!muteWarningShownOnce && (volumeOverlay.IsMuted.Value || audio.Volume.Value <= audio.Volume.MinValue || audio.VolumeTrack.Value <= audio.VolumeTrack.MinValue))
             {
-                notificationOverlay.Post(new MutedNotification());
+                notificationOverlay?.Post(new MutedNotification());
                 muteWarningShownOnce = true;
             }
         }

From f4f5a7e9c8be2b2d0f48a9b5be9a8761d4b856b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Sep 2019 13:20:17 +0800
Subject: [PATCH 2/2] Fix test regressions

---
 osu.Game/Screens/Play/PlayerLoader.cs | 32 +++++++++++++++------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 6cde7522d4..157ff8fcd4 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -59,17 +59,6 @@ namespace osu.Game.Screens.Play
 
         private IdleTracker idleTracker;
 
-        [Resolved(CanBeNull = true)]
-        private NotificationOverlay notificationOverlay { get; set; }
-
-        [Resolved]
-        private VolumeOverlay volumeOverlay { get; set; }
-
-        [Resolved]
-        private AudioManager audioManager { get; set; }
-
-        private static bool muteWarningShownOnce;
-
         public PlayerLoader(Func<Player> createPlayer)
         {
             this.createPlayer = createPlayer;
@@ -159,10 +148,24 @@ namespace osu.Game.Screens.Play
             content.FadeOut(250);
         }
 
-        private void checkVolume(AudioManager audio)
+        [Resolved(CanBeNull = true)]
+        private NotificationOverlay notificationOverlay { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private VolumeOverlay volumeOverlay { get; set; }
+
+        [Resolved]
+        private AudioManager audioManager { get; set; }
+
+        private static bool muteWarningShownOnce;
+
+        private void checkVolume()
         {
+            if (muteWarningShownOnce)
+                return;
+
             //Checks if the notification has not been shown yet and also if master volume is muted, track/music volume is muted or if the whole game is muted.
-            if (!muteWarningShownOnce && (volumeOverlay.IsMuted.Value || audio.Volume.Value <= audio.Volume.MinValue || audio.VolumeTrack.Value <= audio.VolumeTrack.MinValue))
+            if (volumeOverlay?.IsMuted.Value == true || audioManager.Volume.Value <= audioManager.Volume.MinValue || audioManager.VolumeTrack.Value <= audioManager.VolumeTrack.MinValue)
             {
                 notificationOverlay?.Post(new MutedNotification());
                 muteWarningShownOnce = true;
@@ -213,7 +216,8 @@ namespace osu.Game.Screens.Play
         {
             inputManager = GetContainingInputManager();
             base.LoadComplete();
-            checkVolume(audioManager);
+
+            checkVolume();
         }
 
         private ScheduledDelegate pushDebounce;