From b6fb329ea813cc35b81076d2fa120bf5e02c4941 Mon Sep 17 00:00:00 2001
From: Maslov Nikita <webconn@users.noreply.github.com>
Date: Wed, 20 Dec 2023 19:04:48 +0600
Subject: [PATCH] fix timer error message after deferred alarm returns back to
 normal (#97)

---
 debian/changelog |  6 ++++++
 scripts/lib.js   | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2416cf4..472f150 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wb-rules (2.18.8) stable; urgency=medium
+
+  * Fix timer error message after deferred alarm returns back to normal
+
+ -- Nikita Maslov <nikita.maslov@wirenboard.ru>  Wed, 20 Dec 2023 17:31:38 +0600
+
 wb-rules (2.18.7) stable; urgency=medium
 
   * Bump golang.org/x/sys, no functional changes
diff --git a/scripts/lib.js b/scripts/lib.js
index 382e9f8..0dc5f4c 100644
--- a/scripts/lib.js
+++ b/scripts/lib.js
@@ -646,7 +646,10 @@ var Alarms = (function () {
 
             if (!wasActive) {
               if (alarmSrc.alarmDelayMs > 0)
-                activateTimerId = setTimeout(activateAlarm, alarmSrc.alarmDelayMs);
+                activateTimerId = setTimeout(function() {
+                  activateTimerId = null;
+                  activateAlarm();
+                }, alarmSrc.alarmDelayMs);
               else activateAlarm();
             }
 
@@ -679,7 +682,10 @@ var Alarms = (function () {
 
             if (wasActive) {
               if (alarmSrc.noAlarmDelayMs > 0) {
-                deactivateTimerId = setTimeout(deactivateAlarm, alarmSrc.noAlarmDelayMs);
+                deactivateTimerId = setTimeout(function() {
+                  deactivateTimerId = null;
+                  deactivateAlarm();
+                }, alarmSrc.noAlarmDelayMs);
               } else deactivateAlarm();
             }