Merge pull request #610 from DexterHaslem/dc-freeze

fix potential freezes and crashes in instant connect/disconnect edge case
ciribob · Jun 22, 2022 · 7e17c11 · 7e17c11
2 parents 75ae74c + 42f8751
commit 7e17c11
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/NAudio/Wave/WaveInputs/WasapiCapture.cs b/NAudio/Wave/WaveInputs/WasapiCapture.cs
@@ -250,7 +250,8 @@ private void CaptureThread(AudioClient client)
                 client.Stop();
                 // don't dispose - the AudioClient only gets disposed when WasapiCapture is disposed
             }
-            captureThread = null;
+            // dont nuke our captureThread reference here, dispose also checks it
+            // captureThread = null;
             captureState = CaptureState.Stopped;
             RaiseRecordingStopped(exception);
         }
@@ -356,7 +357,11 @@ public void Dispose()
             StopRecording();
             if (captureThread != null)
             {
-                captureThread.Join();
+                if (captureThread.IsAlive)
+                {
+                    captureThread.Abort();
+                    captureThread.Join();
+                }
                 captureThread = null;
             }
             if (audioClient != null)