From e6f1ec57a963cf4bdc16d8c186227dd18230d6d9 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Thu, 23 Mar 2023 18:46:48 +0100
Subject: [PATCH] Bring back and make use of `clearPreviousSamples()`

---
 osu.Game/Skinning/PoolableSkinnableSample.cs | 26 ++++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index eacb33f7d7..76c2c4d7ec 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -74,14 +75,29 @@ protected override void SkinChanged(ISkinSource skin)
             updateSample();
         }
 
-        private void updateSample()
-        {
-            if (sampleInfo == null)
-                return;
+        /// <summary>
+        /// Whether this sample was playing before a skin source change.
+        /// </summary>
+        private bool wasPlaying;
 
-            bool wasPlaying = Playing;
+        private void clearPreviousSamples()
+        {
+            // only run if the samples aren't already cleared.
+            // this ensures the "wasPlaying" state is stored correctly even if multiple clear calls are executed.
+            if (!sampleContainer.Any()) return;
+
+            wasPlaying = Playing;
 
             sampleContainer.Clear();
+            Sample = null;
+        }
+
+        private void updateSample()
+        {
+            clearPreviousSamples();
+
+            if (sampleInfo == null)
+                return;
 
             var sample = CurrentSkin.GetSample(sampleInfo);