Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-28 04:06:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix input dialogs causing crash on shutdown

Browse Source
This commit is contained in:
WarmUpTill
2024-01-17 20:58:23 +01:00
committed by WarmUpTill
parent 8701ec807e
commit 6d1c0dda91
4 changed files with 75 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/advanced-scene-switcher.cpp
View File

@@ -470,7 +470,7 @@ void SwitcherData::Start()
}
}
bool CloseAllInputDialogs();
void CloseAllInputDialogs();
void StopAndClearAllActionQueues();
void SwitcherData::Stop()
@@ -482,23 +482,10 @@ void SwitcherData::Stop()
GetMacroWaitCV().notify_all();
GetMacroTransitionCV().notify_all();
StopAndClearAllActionQueues();
// Not waiting if a dialog was closed is a workaround to avoid
// deadlocks when a variable input dialog is opened while Stop()
// is called.
//
// The QEventLoop handling the dialog would not exit until Stop()
// would return, which itself would wait for the switcher thread
// to complete, which itself is blocked by the variable input
// dialog.
//
// Must be reworked in the future, as this will not go well when
// OBS is shutting down and a dialog is still opened.
if (!CloseAllInputDialogs()) {
th->wait();
delete th;
th = nullptr;
}
CloseAllInputDialogs();
th->wait();
delete th;
th = nullptr;
writeToStatusFile("Advanced Scene Switcher stopped");
}