diff --git a/src/macro-core/macro-condition-websocket.cpp b/src/macro-core/macro-condition-websocket.cpp index f1b87a1b..167530aa 100644 --- a/src/macro-core/macro-condition-websocket.cpp +++ b/src/macro-core/macro-condition-websocket.cpp @@ -56,14 +56,17 @@ bool MacroConditionWebsocket::CheckCondition() for (const auto &msg : *messages) { if (_regex.Enabled()) { if (matchRegex(_regex, msg, _message)) { + SetVariableValue(msg); return true; } } else { if (msg == std::string(_message)) { + SetVariableValue(msg); return true; } } } + SetVariableValue(""); return false; } diff --git a/src/macro-core/macro-condition-websocket.hpp b/src/macro-core/macro-condition-websocket.hpp index bc8ce13a..985c9558 100644 --- a/src/macro-core/macro-condition-websocket.hpp +++ b/src/macro-core/macro-condition-websocket.hpp @@ -8,7 +8,7 @@ class MacroConditionWebsocket : public MacroCondition { public: - MacroConditionWebsocket(Macro *m) : MacroCondition(m) {} + MacroConditionWebsocket(Macro *m) : MacroCondition(m, true) {} bool CheckCondition(); bool Save(obs_data_t *obj) const; bool Load(obs_data_t *obj);