From 5f399add82ece40b2f927982f0762d1d86369c04 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Tue, 1 Oct 2019 18:15:40 +0200
Subject: [PATCH] Resolve @iiSaLMaN 's suggested changes

---
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs | 6 +++++-
 osu.Game/Screens/Play/PlayerLoader.cs                   | 8 --------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 6866fd4c62..74ae641bfe 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
 using osu.Framework.Screens;
+using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
@@ -36,6 +37,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private AudioManager audioManager { get; set; }
 
+        [Resolved]
+        private SessionStatics sessionStatics { get; set; }
+
         /// <summary>
         /// Sets the input manager child to a new test player loader container instance.
         /// </summary>
@@ -137,7 +141,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         /// <param name="assert">The function to be invoked and checked</param>
         private void addVolumeSteps(string volumeName, Action beforeLoad, Action afterLoad, Func<bool> assert)
         {
-            AddStep("reset notification lock", PlayerLoader.ResetNotificationLock);
+            AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce).Value = false);
 
             AddStep("load player", () => ResetPlayer(false, beforeLoad, afterLoad));
             AddUntilStep("wait for player", () => player.IsLoaded);
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 635201879b..7f8ef60a5d 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -536,13 +536,5 @@ namespace osu.Game.Screens.Play
                 };
             }
         }
-
-        /// <summary>
-        /// Sets <see cref="muteWarningShownOnce"/> to false, reserved for testing.
-        /// </summary>
-        public static void ResetNotificationLock()
-        {
-            muteWarningShownOnce = false;
-        }
     }
 }