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

Rename and refactor macro class functions

Browse Source 
LastConditionCheckTime() will be required to support custom condition
check intervals per macro
This commit is contained in:
WarmUpTill
2024-09-02 19:33:29 +02:00
committed by WarmUpTill
parent 94263cc7a0
commit 9eb4e90291
8 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/macro/macro-action-macro.cpp
View File

@@ -196,13 +196,13 @@ void MacroActionMacro::RunActions(Macro *actionMacro) const
}
if (_runOptions.reevaluateConditionState) {
conditionMacro->CeckMatch(true);
conditionMacro->CheckConditions(true);
}
if ((_runOptions.logic == RunOptions::Logic::CONDITIONS &&
conditionMacro->Matched()) ||
conditionMacro->ConditionsMatched()) ||
(_runOptions.logic == RunOptions::Logic::INVERT_CONDITIONS &&
!conditionMacro->Matched())) {
!conditionMacro->ConditionsMatched())) {
runActionsHelper(actionMacro, _runOptions.runElseActions,
_runOptions.setInputs, _runOptions.inputs);
}