From 697e967988bbac57f344c5a0f496a6fb2d993a77 Mon Sep 17 00:00:00 2001 From: horchi Date: Tue, 20 Feb 2018 19:45:47 +0100 Subject: 2018-02-20 version 1.1.87 (horchi)\n - change: No forerunnings for switch timers\n\n --- HISTORY.h | 7 +++++-- timer.c | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/HISTORY.h b/HISTORY.h index cbc9075..7540445 100644 --- a/HISTORY.h +++ b/HISTORY.h @@ -5,8 +5,8 @@ * */ -#define _VERSION "1.1.86" -#define VERSION_DATE "17.02.2018" +#define _VERSION "1.1.87" +#define VERSION_DATE "20.02.2018" #define DB_API 6 @@ -19,6 +19,9 @@ /* * ------------------------------------ +2018-02-20 version 1.1.87 (horchi) + - change: No forerunnings for switch timers + 2018-02-17 version 1.1.86 (horchi) - bugfix: Fix for 1.1.85 diff --git a/timer.c b/timer.c index 3295085..28c8a6c 100644 --- a/timer.c +++ b/timer.c @@ -500,11 +500,11 @@ int cUpdate::takeSwitchTimer() tell(1, "Got switch timer (%ld) for channel '%s' at '%s'", timerid, timerDb->getStrValue("CHANNELID"), - l2pTime(timerDb->getIntValue("_STARTTIME") - tmeSecondsPerMinute).c_str()); + l2pTime(timerDb->getIntValue("_STARTTIME")).c_str()); switchTimers[timerid].eventId = timerDb->getIntValue("EVENTID"); switchTimers[timerid].channelId = timerDb->getStrValue("CHANNELID"); - switchTimers[timerid].start = timerDb->getIntValue("_STARTTIME") - tmeSecondsPerMinute; + switchTimers[timerid].start = timerDb->getIntValue("_STARTTIME"); timerDb->setCharValue("ACTION", taAssumed); timerDb->setCharValue("STATE", tsPending); -- cgit v1.2.3