4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

win-wasapi: Fix Stop hang

Browse source 
Fix hang when audio capture is active in the background and stopped by
either closing OBS, or switching scene collections.
This commit is contained in:
jpark37 2022-10-01 09:41:53 -07:00 • committed by jp9000
commit d21891b3ca
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/win-wasapi/win-wasapi.cpp
View file

@ -528,9 +528,6 @@ 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());
@ -538,8 +535,12 @@ void WASAPISource::Stop()
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);