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

Fix scene switch action aborting macro execution

Browse Source 
abortMacroWait was not reset in waitForTransitionChangeFixedDuration()
leading to the scene switch action returning false
This commit is contained in:
WarmUpTill
2023-01-22 16:24:37 +01:00
committed by WarmUpTill
parent e43793354e
commit ebdbb9011f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/macro-core/macro-action-scene-switch.cpp
View File

@@ -31,7 +31,6 @@ void waitForTransitionChangeFixedDuration(int duration)
auto time = std::chrono::high_resolution_clock::now() +
std::chrono::milliseconds(duration);
switcher->abortMacroWait = false;
std::unique_lock<std::mutex> lock(switcher->m);
while (!switcher->abortMacroWait) {
if (switcher->macroTransitionCv.wait_until(lock, time) ==
@@ -107,6 +106,7 @@ bool MacroActionSwitchScene::PerformAction()
const int expectedTransitionDuration =
getExpectedTransitionDuration(scene, transition,
_duration.seconds);
switcher->abortMacroWait = false;
if (expectedTransitionDuration < 0) {
waitForTransitionChange(transition);
} else {