Fix release of COM objects in DirectSoundOut.cs

ahmedalisobhi · May 14, 2020 · 9356f58 · 9356f58
1 parent 1f2cbc7
commit 9356f58
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/NAudio/Wave/WaveOutputs/DirectSoundOut.cs b/NAudio/Wave/WaveOutputs/DirectSoundOut.cs
@@ -239,7 +239,7 @@ private void InitializeDirectSound()
             // Open DirectSound
             lock (this.m_LockObject)
             {
-                directSound = null;
+                Debug.Assert(directSound == null);
                 DirectSoundCreate(ref device, out directSound, IntPtr.Zero);
 
                 if (directSound != null)
@@ -553,13 +553,20 @@ private void StopPlayback()
                     CleanUpSecondaryBuffer();
 
                     secondaryBuffer.Stop();
+                    Marshal.ReleaseComObject(secondaryBuffer);
                     secondaryBuffer = null;
                 }
                 if (primarySoundBuffer != null)
                 {
                     primarySoundBuffer.Stop();
+                    Marshal.ReleaseComObject(primarySoundBuffer);
                     primarySoundBuffer = null;
                 }
+                if (directSound != null)
+                {
+                    Marshal.ReleaseComObject(directSound);
+                    directSound = null;
+                }
             }
         }