win-wasapi: Fix Stop hang

Fix hang when audio capture is active in the background and stopped by either closing OBS, or switching scene collections.
obsproject · Oct 1, 2022 · d21891b · d21891b
1 parent 05b6346
commit d21891b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/plugins/win-wasapi/win-wasapi.cpp b/plugins/win-wasapi/win-wasapi.cpp
@@ -528,18 +528,19 @@ void WASAPISource::Start()
 
 void WASAPISource::Stop()
 {
-	if (!reconnectThread.Valid())
-		WaitForSingleObject(reconnectSignal, INFINITE);
-
 	SetEvent(stopSignal);
 
 	blog(LOG_INFO, "WASAPI: Device '%s' Terminated", device_name.c_str());
 
 	if (rtwq_supported)
 		SetEvent(receiveSignal);
 
-	if (reconnectThread.Valid())
+	if (reconnectThread.Valid()) {
 		WaitForSingleObject(idleSignal, INFINITE);
+	} else {
+		const HANDLE sigs[] = {reconnectSignal, idleSignal};
+		WaitForMultipleObjects(_countof(sigs), sigs, false, INFINITE);
+	}
 
 	SetEvent(exitSignal);