Prevent crash when macro contains invalid action or condition

WarmUpTill · Jan 29, 2025 · e140832 · e140832
1 parent 6a58684
commit e140832
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/lib/macro/macro.cpp b/lib/macro/macro.cpp
@@ -246,6 +246,10 @@ bool Macro::CheckConditions(bool ignorePause)
 
 	_matched = false;
 	for (auto &condition : _conditions) {
+		if (!condition) {
+			continue;
+		}
+
 		if (_paused && !ignorePause) {
 			vblog(LOG_INFO, "Macro %s is paused", _name.c_str());
 			return false;
@@ -383,6 +387,9 @@ bool Macro::RunActionsHelper(
 
 	bool actionsExecutedSuccessfully = true;
 	for (auto &action : actions) {
+		if (!action) {
+			continue;
+		}
 		if (action->Enabled()) {
 			action->LogAction();
 			actionsExecutedSuccessfully =