Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-09-02 14:45:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash when deleting macro with wait action

Browse Source 
Note that this might still not be completely race free but should
improve the situation a lot.
This commit is contained in:
WarmUpTill
2021-08-07 09:55:56 +02:00
committed by WarmUpTill
parent 1474509cb9
commit 06ea7bf1d9
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/macro-action-wait.cpp
View File

@@ -38,10 +38,12 @@ bool MacroActionWait::PerformAction()
sleep_duration);
std::unique_lock<std::mutex> lock(switcher->m);
auto r = switcher->cv.wait_for(
switcher->abortMacroWait = false;
switcher->macroWaitCv.wait_for(
lock,
std::chrono::milliseconds((long long)(sleep_duration * 1000)));
return r == std::cv_status::timeout;
std::chrono::milliseconds((long long)(sleep_duration * 1000)),
[] { return switcher->abortMacroWait.load(); });
return !switcher->abortMacroWait;
}
bool MacroActionWait::Save(obs_data_t *obj)