From c9769a799d70d2bf53dcd7f99e76aecc5f9b67dc Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Wed, 9 Jun 2021 19:19:00 +0200 Subject: [PATCH] Abort macro if wait was aborted by manual scene change --- src/macro-action-wait.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/macro-action-wait.cpp b/src/macro-action-wait.cpp index 024960c4..8ce168f4 100644 --- a/src/macro-action-wait.cpp +++ b/src/macro-action-wait.cpp @@ -38,9 +38,10 @@ bool MacroActionWait::PerformAction() sleep_duration); std::unique_lock 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)