This commit is contained in:
WarmUpTill
2024-01-24 22:16:07 +01:00
committed by WarmUpTill
parent aeb0e7f8ad
commit 88bc87b367
4 changed files with 8 additions and 8 deletions

View File

@@ -212,7 +212,7 @@ bool MacroConditionMacro::Load(obs_data_t *obj)
bool MacroConditionMacro::PostLoad()
{
return MacroCondition::PostLoad() && MacroRefCondition::PostLoad() &&
MultiMacroRefCondtition::PostLoad();
MultiMacroRefCondition::PostLoad();
}
std::string MacroConditionMacro::GetShortDesc() const

View File

@@ -13,12 +13,12 @@
namespace advss {
class MacroConditionMacro : public MultiMacroRefCondtition,
class MacroConditionMacro : public MultiMacroRefCondition,
public MacroRefCondition {
public:
MacroConditionMacro(Macro *m)
: MacroCondition(m),
MultiMacroRefCondtition(m),
MultiMacroRefCondition(m),
MacroRefCondition(m)
{
}

View File

@@ -169,13 +169,13 @@ bool MacroRefCondition::PostLoad()
return true;
}
MultiMacroRefCondtition::MultiMacroRefCondtition(Macro *m,
bool supportsVariableValue)
MultiMacroRefCondition::MultiMacroRefCondition(Macro *m,
bool supportsVariableValue)
: MacroCondition(m, supportsVariableValue)
{
}
bool MultiMacroRefCondtition::PostLoad()
bool MultiMacroRefCondition::PostLoad()
{
for (auto &macro : _macros) {
macro.PostLoad();

View File

@@ -89,9 +89,9 @@ public:
MacroRef _macro;
};
class EXPORT MultiMacroRefCondtition : virtual public MacroCondition {
class EXPORT MultiMacroRefCondition : virtual public MacroCondition {
public:
MultiMacroRefCondtition(Macro *m, bool supportsVariableValue = false);
MultiMacroRefCondition(Macro *m, bool supportsVariableValue = false);
bool PostLoad() override;
std::vector<MacroRef> _macros;