diff options
-rw-r--r-- | HISTORY.h | 7 | ||||
-rw-r--r-- | timer.c | 7 |
2 files changed, 10 insertions, 4 deletions
@@ -5,8 +5,8 @@ * */ -#define _VERSION "1.1.109" -#define VERSION_DATE "17.02.2020" +#define _VERSION "1.1.110" +#define VERSION_DATE "24.02.2020" #define DB_API 7 @@ -19,6 +19,9 @@ /* * ------------------------------------ +2020-02-24: version 1.1.110 (horchi) + - bugfix: Fixed timer deactivation by webif + 2020-02-17: version 1.1.109 (horchi) - bugfix: Fixed conflicting timer start times @@ -618,8 +618,6 @@ int cUpdate::updateTimerTable() #if defined (APIVERSNUM) && (APIVERSNUM >= 20301) LOCK_TIMERS_WRITE; cTimers* timers = Timers; - // cTimersLock timersLock(true); - // cTimers* timers = timersLock.Timers(); #else cTimers* timers = &Timers; #endif @@ -711,6 +709,11 @@ 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(); |