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

Enable getting variable values from filter condition

Browse Source
This commit is contained in:
WarmUpTill
2023-01-14 19:00:53 +01:00
committed by WarmUpTill
parent c4c4a27dcb
commit 3d4b69848c
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/macro-core/macro-condition-filter.cpp
View File

@@ -54,12 +54,20 @@ bool MacroConditionFilter::CheckCondition()
break;
case Condition::SETTINGS:
ret = compareSourceSettings(_filter, _settings, _regex);
if (IsReferencedInVars()) {
SetVariableValue(getSourceSettings(_filter));
}
break;
default:
break;
}
obs_source_release(s);
if (GetVariableValue().empty()) {
SetVariableValue(ret ? "true" : "false");
}
return ret;
}

2
src/macro-core/macro-condition-filter.hpp
View File

@@ -10,7 +10,7 @@
class MacroConditionFilter : public MacroCondition {
public:
MacroConditionFilter(Macro *m) : MacroCondition(m) {}
MacroConditionFilter(Macro *m) : MacroCondition(m, true) {}
bool CheckCondition();
bool Save(obs_data_t *obj) const;
bool Load(obs_data_t *obj);