From 1c3ff927a53b189b019790905c855db2ca6a90d3 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sat, 14 Jan 2023 19:24:36 +0100 Subject: [PATCH] Enable getting variable values from window condition --- src/macro-core/macro-condition-window.cpp | 5 +++-- src/macro-core/macro-condition-window.hpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/macro-core/macro-condition-window.cpp b/src/macro-core/macro-condition-window.cpp index 0f62adf9..c155f411 100644 --- a/src/macro-core/macro-condition-window.cpp +++ b/src/macro-core/macro-condition-window.cpp @@ -45,6 +45,7 @@ bool MacroConditionWindow::CheckWindowTitleSwitchRegex( break; } } + return match; } @@ -56,11 +57,12 @@ bool foregroundWindowChanged() bool MacroConditionWindow::CheckCondition() { const std::string ¤tWindowTitle = switcher->currentTitle; + SetVariableValue(currentWindowTitle); + std::vector windowList; GetWindowList(windowList); bool match = false; - if (std::find(windowList.begin(), windowList.end(), _window) != windowList.end()) { match = CheckWindowTitleSwitchDirect(currentWindowTitle); @@ -69,7 +71,6 @@ bool MacroConditionWindow::CheckCondition() windowList); } match = match && (!_windowFocusChanged || foregroundWindowChanged()); - return match; } diff --git a/src/macro-core/macro-condition-window.hpp b/src/macro-core/macro-condition-window.hpp index e91847ac..b7656c5b 100644 --- a/src/macro-core/macro-condition-window.hpp +++ b/src/macro-core/macro-condition-window.hpp @@ -6,7 +6,7 @@ class MacroConditionWindow : public MacroCondition { public: - MacroConditionWindow(Macro *m) : MacroCondition(m) {} + MacroConditionWindow(Macro *m) : MacroCondition(m, true) {} bool CheckCondition(); bool Save(obs_data_t *obj) const; bool Load(obs_data_t *obj);