1 files changed, 17 insertions, 16 deletions

diff --git a/mode-button.rsc b/mode-button.rsc
index 90fe80e..d82f899 100644
--- a/mode-button.rsc
+++ b/mode-button.rsc
@@ -1,18 +1,19 @@
 #!rsc by RouterOS
 # RouterOS script: mode-button
-# Copyright (c) 2018-2024 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2018-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.14
+# requires RouterOS, version=7.15
+# requires device-mode, scheduler
 #
 # act on multiple mode and reset button presses
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/mode-button.md
-
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
+# https://rsc.eworm.de/doc/mode-button.md
 
 :local ExitOK false;
-:do {
+:onerror Err {
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global ModeButton;
@@ -25,7 +26,7 @@
 
   :if ([ :len $Scheduler ] = 0) do={
     $LogPrint info $ScriptName ("Creating scheduler _ModeButtonScheduler, counting presses...");
-    :global ModeButtonScheduler do={ :do {
+    :global ModeButtonScheduler do={ :onerror Err {
       :local FuncName $0;
 
       :global ModeButton;
@@ -68,11 +69,11 @@
             :delay 200ms;
           }
 
-          :do {
+          :onerror Err {
             [ :parse $Code ];
-          } on-error={
+          } do={
             $LogPrint warning $FuncName \
-                ("The code for " . $Count . " mode-button presses failed with runtime error!");
+                ("The code for " . $Count . " mode-button presses failed with runtime error: " . $Err);
           }
         } else={
           $LogPrint warning $FuncName \
@@ -81,8 +82,8 @@
       } else={
         $LogPrint info $FuncName ("No action defined for " . $Count . " mode-button presses.");
       }
-    } on-error={
-      :global ExitError; $ExitError false $0;
+    } do={
+      :global ExitError; $ExitError false $0 $Err;
     } }
     /system/scheduler/add name="_ModeButtonScheduler" \
         on-event=":global ModeButtonScheduler; \$ModeButtonScheduler;" interval=3s;
@@ -90,6 +91,6 @@
     $LogPrint debug $ScriptName ("Updating scheduler _ModeButtonScheduler...");
     /system/scheduler/set $Scheduler start-time=[ /system/clock/get time ];
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }