Stop decoding a track properly if disposed

ppy · Oct 16, 2023 · fc7f57f · fc7f57f
1 parent e463fb3
commit fc7f57f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/osu.Framework/Audio/Track/TrackSDL2.cs b/osu.Framework/Audio/Track/TrackSDL2.cs
@@ -60,11 +60,15 @@ internal void AddToQueue(byte[] audio, object? userdata, AudioDecoder.AudioDecod
                     player.PutSamplesInStream(audio);
 
                     if (done)
+                    {
                         player.DonePutting();
+                        decodeData = null;
+                    }
                 }
             }
 
-            Interlocked.Exchange(ref decodeData, data);
+            if (!isLoaded)
+                Interlocked.Exchange(ref decodeData, data);
         }
 
         protected override void UpdateState()
@@ -207,6 +211,8 @@ protected override void Dispose(bool disposing)
             isRunning = false;
             (Mixer as SDL2AudioMixer)?.StreamFree(this);
 
+            decodeData?.Stop();
+
             lock (syncRoot)
                 player.Dispose();