From edc63146344a81f6ff3c993d11690e99579dbd6b Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Wed, 15 Mar 2023 10:49:59 +0100
Subject: [PATCH] Drank some coffee and figured out the fix

---
 osu.Game/Screens/Play/PauseOverlay.cs        |  1 -
 osu.Game/Screens/Play/Player.cs              |  5 -----
 osu.Game/Skinning/PoolableSkinnableSample.cs |  2 ++
 osu.Game/Skinning/SkinReloadableDrawable.cs  | 20 +++++++++++---------
 osu.Game/Skinning/SkinnableSound.cs          |  7 -------
 5 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 452e170cc6..db42998c45 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Screens.Play
 
         private SkinnableSound pauseLoop;
 
-        public void FlushPendingSkinChanges() => pauseLoop.FlushPendingSkinChanges();
         protected override Action BackAction => () => InternalButtons.First().TriggerClick();
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index d4180068d3..bc453d2151 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -316,11 +316,6 @@ namespace osu.Game.Screens.Play
             // we may want to limit this in the future to disallow rulesets from outright replacing elements the user expects to be there.
             failAnimationLayer.Add(createOverlayComponents(Beatmap.Value));
 
-            rulesetSkinProvider.SourceChanged += () =>
-            {
-                PauseOverlay.FlushPendingSkinChanges();
-            };
-
             if (!DrawableRuleset.AllowGameplayOverlays)
             {
                 HUDOverlay.ShowHud.Value = false;
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 0158c47ea3..c8b0955db2 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -132,6 +132,8 @@ namespace osu.Game.Skinning
             if (Sample == null)
                 return;
 
+            FlushPendingSkinChanges();
+
             activeChannel = Sample.GetChannel();
             activeChannel.Looping = Looping;
             activeChannel.Play();
diff --git a/osu.Game/Skinning/SkinReloadableDrawable.cs b/osu.Game/Skinning/SkinReloadableDrawable.cs
index ff51eb6dce..b6b9650048 100644
--- a/osu.Game/Skinning/SkinReloadableDrawable.cs
+++ b/osu.Game/Skinning/SkinReloadableDrawable.cs
@@ -27,6 +27,15 @@ namespace osu.Game.Skinning
         /// </summary>
         protected ISkinSource CurrentSkin { get; private set; } = null!;
 
+        protected void FlushPendingSkinChanges()
+        {
+            if (pendingSkinChange == null)
+                return;
+
+            pendingSkinChange.RunTask();
+            pendingSkinChange = null;
+        }
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource source)
         {
@@ -42,15 +51,6 @@ namespace osu.Game.Skinning
             pendingSkinChange = Scheduler.Add(skinChanged);
         }
 
-        public virtual void FlushPendingSkinChanges()
-        {
-            if (pendingSkinChange == null)
-                return;
-
-            pendingSkinChange.RunTask();
-            pendingSkinChange = null;
-        }
-
         protected override void LoadAsyncComplete()
         {
             base.LoadAsyncComplete();
@@ -61,6 +61,8 @@ namespace osu.Game.Skinning
         {
             SkinChanged(CurrentSkin);
             OnSkinChanged?.Invoke();
+
+            pendingSkinChange = null;
         }
 
         /// <summary>
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index f80b1f52fa..59b3799e0a 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -110,13 +110,6 @@ namespace osu.Game.Skinning
             }
         }
 
-        public override void FlushPendingSkinChanges()
-        {
-            base.FlushPendingSkinChanges();
-
-            samplesContainer.ForEach(c => c.FlushPendingSkinChanges());
-        }
-
         /// <summary>
         /// Plays the samples.
         /// </summary>