From: Laurent Mazet <mazet@softndesign.org>
Date: Wed, 21 Apr 2021 08:45:03 +0000 (+0200)
Subject: Merge branch 'develop' into cell_caption_option
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=fa58416e0503927f2cf29c2804bd219ff5f7c26c;p=trivabble.git

Merge branch 'develop' into cell_caption_option
---

fa58416e0503927f2cf29c2804bd219ff5f7c26c
diff --cc public/trivabble.js
index b191b50,1bfe8d6..545e303
--- a/public/trivabble.js
+++ b/public/trivabble.js
@@@ -2278,10 -2268,10 +2281,10 @@@
              setTimerState(document.getElementById("enable-timer").checked);
          };
  
 -        setTimerState(getSetting("TimerEnable", getSetting("ENABLE_TIMER")));
 +        setTimerState(getSetting("ENABLE_TIMER"));
      }
  
-     let timerTimeout = 0
+     let timerTimeout = 0;
  
      function updateTimer() {
          const currentTimer = timerDate();
@@@ -2290,10 -2280,10 +2293,10 @@@
      }
  
      function setTimerState(enabled) {
 -        setSetting("TimerEnable", enabled);
 +        setSetting("ENABLE_TIMER", enabled);
          if (timerTimeout) {
              clearInterval(timerTimeout);
-             timerTimeout = 0
+             timerTimeout = 0;
          }
  
          if (enabled) {