From f446cdf8961586c7bccb7a686b399f454f5cf31a Mon Sep 17 00:00:00 2001 From: horchi Date: Mon, 17 Feb 2020 19:28:56 +0100 Subject: 2020-02-17: version 1.1.109 (horchi)\n - bugfix: Fixed conflicting timer start times\n\n --- HISTORY.h | 7 +++++-- configs/epg.dat | 1 + ttools.c | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/HISTORY.h b/HISTORY.h index 6bf121e..077cce5 100644 --- a/HISTORY.h +++ b/HISTORY.h @@ -5,8 +5,8 @@ * */ -#define _VERSION "1.1.108" -#define VERSION_DATE "16.02.2020" +#define _VERSION "1.1.109" +#define VERSION_DATE "17.02.2020" #define DB_API 7 @@ -19,6 +19,9 @@ /* * ------------------------------------ +2020-02-17: version 1.1.109 (horchi) + - bugfix: Fixed conflicting timer start times + 2020-02-16: version 1.1.108 (horchi) - bugfix: 'Fix of fix' of time handling for timers without event :( diff --git a/configs/epg.dat b/configs/epg.dat index aae0c97..d23f7a7 100644 --- a/configs/epg.dat +++ b/configs/epg.dat @@ -611,6 +611,7 @@ Table timers EVENTID "useid" eventid UInt 0 Data, CHANNELID "" channelid Ascii 50 Data, + EVTSTARTTIME "start time of the event, if any" evtstarttime Int 10 Data, _STARTTIME "pre filled start timer for trigger" _starttime Int 10 Data, _ENDTIME "pre filled end time" _endtime Int 10 Data, diff --git a/ttools.c b/ttools.c index 685f383..58dcd44 100644 --- a/ttools.c +++ b/ttools.c @@ -334,6 +334,7 @@ int updateRowByTimer(cDbRow* timerRow, const cTimer* t) timerRow->setValue("VDRUUID", Epg2VdrConfig.uuid); timerRow->setValue("EVENTID", t->Event() ? (long)t->Event()->EventID() : 0); + if (t->Event()) timerRow->setValue("EVTSTARTTIME", t->Event()->StartTime()); timerRow->setValue("_STARTTIME", startTime); timerRow->setValue("_ENDTIME", endTime); timerRow->setValue("CHANNELID", channelId); -- cgit v1.2.3