From 99c8a46296fb2f8fedc77f834ce131e609ad4d0a Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Thu, 6 Jun 2024 20:19:13 +0200 Subject: [PATCH] Add option to ignore pause during condition check --- lib/macro/macro.cpp | 5 +++-- lib/macro/macro.hpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/macro/macro.cpp b/lib/macro/macro.cpp index 083abd53..868ee7b8 100644 --- a/lib/macro/macro.cpp +++ b/lib/macro/macro.cpp @@ -101,7 +101,7 @@ void Macro::PrepareMoveToGroup(std::shared_ptr group, } } -bool Macro::CeckMatch() +bool Macro::CeckMatch(bool ignorePause) { if (_isGroup) { return false; @@ -109,7 +109,7 @@ bool Macro::CeckMatch() _matched = false; for (auto &c : _conditions) { - if (_paused) { + if (_paused && !ignorePause) { vblog(LOG_INFO, "Macro %s is paused", _name.c_str()); return false; } @@ -185,6 +185,7 @@ bool Macro::CeckMatch() if (!_conditionSateChanged && _performActionsOnChange) { _onPreventedActionExecution = true; } + _lastMatched = _matched; _lastCheckTime = std::chrono::high_resolution_clock::now(); return _matched; diff --git a/lib/macro/macro.hpp b/lib/macro/macro.hpp index 5193eb1d..bf7f015f 100644 --- a/lib/macro/macro.hpp +++ b/lib/macro/macro.hpp @@ -29,7 +29,7 @@ public: std::string Name() const { return _name; } void SetName(const std::string &name); - bool CeckMatch(); + bool CeckMatch(bool ignorePause = false); bool Matched() const { return _matched; } int64_t MsSinceLastCheck() const; bool ShouldRunActions() const;