diff --git a/lib/macro/macro-condition-macro.cpp b/lib/macro/macro-condition-macro.cpp index 4fca3b69..16a81254 100644 --- a/lib/macro/macro-condition-macro.cpp +++ b/lib/macro/macro-condition-macro.cpp @@ -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 diff --git a/lib/macro/macro-condition-macro.hpp b/lib/macro/macro-condition-macro.hpp index 15d3b4f7..141c0f67 100644 --- a/lib/macro/macro-condition-macro.hpp +++ b/lib/macro/macro-condition-macro.hpp @@ -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) { } diff --git a/lib/macro/macro-condition.cpp b/lib/macro/macro-condition.cpp index 72cabf4c..f529bbc9 100644 --- a/lib/macro/macro-condition.cpp +++ b/lib/macro/macro-condition.cpp @@ -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 ¯o : _macros) { macro.PostLoad(); diff --git a/lib/macro/macro-condition.hpp b/lib/macro/macro-condition.hpp index 7ccce606..987036b9 100644 --- a/lib/macro/macro-condition.hpp +++ b/lib/macro/macro-condition.hpp @@ -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 _macros;