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

Abort macro if wait was aborted by manual scene change

Browse Source
This commit is contained in:
WarmUpTill 2021-06-09 19:19:00 +02:00 committed by WarmUpTill
parent 047ca93486
commit c9769a799d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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