2020-03-13: version 1.1.112 (horchi)\n - bugfix: Fixed timer deactivation by webif again\n\n1.1.112

2 files changed, 13 insertions, 7 deletions

diff --git a/HISTORY.h b/HISTORY.h
index 82c47fc..ad37626 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
  *
  */
 
-#define _VERSION     "1.1.111"
-#define VERSION_DATE "29.02.2020"
+#define _VERSION     "1.1.112"
+#define VERSION_DATE "13.03.2020"
 
 #define DB_API 7
 
@@ -19,6 +19,9 @@
 /*
  * ------------------------------------
 
+2020-03-13: version 1.1.112 (horchi)
+   - bugfix: Fixed timer deactivation by webif again
+
 2020-02-29: version 1.1.111 (horchi)
    - bugfix: Fixed time calculation
 
diff --git a/timer.c b/timer.c
index c55e4ab..6f20e48 100644
--- a/timer.c
+++ b/timer.c
@@ -709,11 +709,6 @@ int cUpdate::updateTimerTable()
       int insert = yes;
       int timerId = getTimerIdOf(t);
 
-      // update only assumed timers
-
-      if (!timerDb->getValue("ACTION")->isEmpty() && !timerDb->hasCharValue("ACTION", taAssumed))
-         continue;
-
       // no timer id or not in table -> handle as insert!
 
       timerDb->clear();
@@ -727,6 +722,14 @@ int cUpdate::updateTimerTable()
          timerDb->clearChanged();
       }
 
+      // update only assumed timers
+
+      if (!insert)
+      {
+         if (!timerDb->getValue("ACTION")->isEmpty() && !timerDb->hasCharValue("ACTION", taAssumed))
+            continue;
+      }
+
       updateRowByTimer(timerDb->getRow(), t);
 
       if (insert)