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

Fix freeze when stopping waiting macro via "Run macro" button

Browse Source
This commit is contained in:
WarmUpTill 2026-06-13 23:21:31 +02:00 committed by WarmUpTill
parent c07c00325f
commit 6c90f517e4
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/macro/macro-run-button.cpp
View File

@ -108,7 +108,7 @@ void MacroRunButton::Pressed()
const bool abortMacro = DisplayMessage(
err.arg(QString::fromStdString(macro->Name())), true);
if (abortMacro) {
macro->Stop();
macro->SignalStop();
}
}

6
lib/macro/macro.cpp
View File

@ -552,6 +552,12 @@ Macro::PauseStateSaveBehavior Macro::GetPauseStateSaveBehavior() const
return _pauseSaveBehavior;
}
void Macro::SignalStop()
{
_stop = true;
GetMacroWaitCV().notify_all();
}
void Macro::Stop()
{
_stop = true;

2
lib/macro/macro.hpp
View File

@ -61,7 +61,7 @@ public:
PauseStateSaveBehavior GetPauseStateSaveBehavior() const;
void Stop();
void SignalStop() { _stop = true; }
void SignalStop();
bool GetStop() const { return _stop; }
void ResetTimers();