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

Allow stop of current macro when using run button

Browse Source
This commit is contained in:
WarmUpTill
2024-02-25 13:17:15 +01:00
committed by WarmUpTill
parent 3a1c353ea3
commit f50f31ec4c
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,11 +96,15 @@ void MacroRunButton::Pressed()
bool ret = _elseStateActive ? macro->PerformActions(false, true, true)
: macro->PerformActions(true, true, true);
if (ret) {
return;
}
if (!ret) {
QString err =
obs_module_text("AdvSceneSwitcher.macroTab.runFail");
DisplayMessage(err.arg(QString::fromStdString(macro->Name())));
QString err = obs_module_text("AdvSceneSwitcher.macroTab.runFail");
const bool abortMacro = DisplayMessage(
err.arg(QString::fromStdString(macro->Name())), true);
if (abortMacro) {
macro->Stop();
}
}