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

Replace "Ignore Entry" condition logic with SwitchButton toggle

Browse Source
This commit is contained in:
WarmUpTill
2026-05-01 18:59:47 +02:00
committed by WarmUpTill
parent c73a5866d7
commit 41866bcb24
15 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/macro/macro-condition.cpp
View File

@@ -31,6 +31,10 @@ bool MacroCondition::Load(obs_data_t *obj)
{
MacroSegment::Load(obj);
_logic.Load(obj, "logic");
if (_logic.GetType() == Logic::Type::NONE) {
SetEnabled(false);
_logic.SetType(Logic::Type::AND);
}
_durationModifier.Load(obj);
return true;
}
@@ -50,7 +54,8 @@ void MacroCondition::ValidateLogicSelection(bool isRootCondition,
return;
}
_logic.SetType(Logic::Type::NONE);
_logic.SetType(Logic::Type::AND);
SetEnabled(false);
blog(LOG_WARNING,
"setting invalid logic selection to 'ignore' for macro %s",
context);