mirror of
https://github.com/WarmUpTill/SceneSwitcher.git
synced 2026-09-08 01:26:04 -05:00
Fix freeze when stopping waiting macro via "Run macro" button
This commit is contained in:
@@ -108,7 +108,7 @@ void MacroRunButton::Pressed()
|
||||
const bool abortMacro = DisplayMessage(
|
||||
err.arg(QString::fromStdString(macro->Name())), true);
|
||||
if (abortMacro) {
|
||||
macro->Stop();
|
||||
macro->SignalStop();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -552,6 +552,12 @@ Macro::PauseStateSaveBehavior Macro::GetPauseStateSaveBehavior() const
|
||||
return _pauseSaveBehavior;
|
||||
}
|
||||
|
||||
void Macro::SignalStop()
|
||||
{
|
||||
_stop = true;
|
||||
GetMacroWaitCV().notify_all();
|
||||
}
|
||||
|
||||
void Macro::Stop()
|
||||
{
|
||||
_stop = true;
|
||||
|
||||
@@ -61,7 +61,7 @@ public:
|
||||
PauseStateSaveBehavior GetPauseStateSaveBehavior() const;
|
||||
|
||||
void Stop();
|
||||
void SignalStop() { _stop = true; }
|
||||
void SignalStop();
|
||||
bool GetStop() const { return _stop; }
|
||||
void ResetTimers();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user