From b3aa4795157bcffca53c4ad727650d6e9b92bc93 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 17 Jul 2026 09:04:39 +0200
Subject: [PATCH] mode-button: resolve nested conditions

---
 mode-button.rsc | 52 +++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/mode-button.rsc b/mode-button.rsc
index f46eaa3c..d7a0b3f1 100644
--- a/mode-button.rsc
+++ b/mode-button.rsc
@@ -54,32 +54,34 @@
       :set ModeButtonScheduler;
       /system/scheduler/remove [ find where name="_ModeButtonScheduler" ];
 
-      :if ([ :len $Code ] > 0) do={
-        :if ([ $ValidateSyntax $Code ] = true) do={
-          $LogPrint info $FuncName ("Acting on " . $Count . " mode-button presses: " . $Code);
-
-          :for I from=1 to=$Count do={
-            $LEDInvert;
-            :if ([ /system/routerboard/settings/get silent-boot ] = false) do={
-              :beep length=200ms;
-            }
-            :delay 200ms;
-            $LEDInvert;
-            :delay 200ms;
-          }
-
-          :onerror Err {
-            [ :parse $Code ];
-          } do={
-            $LogPrint warning $FuncName \
-                ("The code for " . $Count . " mode-button presses failed with runtime error: " . $Err);
-          }
-        } else={
-          $LogPrint warning $FuncName \
-              ("The code for " . $Count . " mode-button presses failed syntax validation!");
-        }
-      } else={
+      :if ([ :len $Code ] = 0) do={
         $LogPrint info $FuncName ("No action defined for " . $Count . " mode-button presses.");
+        :return false;
+      }
+
+      :if ([ $ValidateSyntax $Code ] = false) do={
+        $LogPrint warning $FuncName \
+            ("The code for " . $Count . " mode-button presses failed syntax validation!");
+        :return false;
+      }
+
+      $LogPrint info $FuncName ("Acting on " . $Count . " mode-button presses: " . $Code);
+
+      :for I from=1 to=$Count do={
+        $LEDInvert;
+        :if ([ /system/routerboard/settings/get silent-boot ] = false) do={
+          :beep length=200ms;
+        }
+        :delay 200ms;
+        $LEDInvert;
+        :delay 200ms;
+      }
+
+      :onerror Err {
+        [ :parse $Code ];
+      } do={
+        $LogPrint warning $FuncName \
+            ("The code for " . $Count . " mode-button presses failed with runtime error: " . $Err);
       }
     } do={
       :global ExitOnError; $ExitOnError $0 $Err;