Bring back and make use of clearPreviousSamples()

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()
+        /// <summary>
+        /// Whether this sample was playing before a skin source change.
+        /// </summary>
+        private bool wasPlaying;
+
+        private void clearPreviousSamples()
         {
-            if (sampleInfo == null)
-                return;
+            // 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;
 
-            bool wasPlaying = Playing;
+            wasPlaying = Playing;
 
             sampleContainer.Clear();
+            Sample = null;
+        }
+
+        private void updateSample()
+        {
+            clearPreviousSamples();
+
+            if (sampleInfo == null)
+                return;
 
             var sample = CurrentSkin.GetSample(sampleInfo);