4 files changed, 14 insertions, 7 deletions
diff --git a/HISTORY.h b/HISTORY.h
index cefa8b7..f6bd680 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -4,8 +4,8 @@
  * -----------------------------------
  */
 
-#define _VERSION     "1.1.156"
-#define VERSION_DATE "12.02.2020"
+#define _VERSION     "1.1.157"
+#define VERSION_DATE "17.02.2020"
 #define DB_API       7
 
 #ifdef GIT_REV
@@ -18,6 +18,10 @@
  * ------------------------------------
  *
  *
+
+2020-02-17: version 1.1.157 (horchi)
+   - bugfix: Fixed conflicting timer start times
+
 2020-02-12: version 1.1.156 (horchi)
    - added: New fields for future fetures
 
diff --git a/configs/epg.dat b/configs/epg.dat
index 50e3fe0..1f605f7 100644
--- a/configs/epg.dat
+++ b/configs/epg.dat
@@ -614,6 +614,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 time for trigger"      _starttime           Int         10 Data,
    _ENDTIME             "pre filled end time"                    _endtime             Int         10 Data,
 
diff --git a/lib/searchtimer.c b/lib/searchtimer.c
index d844c18..06aa323 100644
--- a/lib/searchtimer.c
+++ b/lib/searchtimer.c
@@ -770,14 +770,14 @@ int cSearchTimer::checkTimers()
 
       // Check Start Time
 
-      if (!timerDb->hasValue("_STARTTIME", useeventsDb->getIntValue("STARTTIME")))
+      if (!timerDb->hasValue("EVTSTARTTIME", useeventsDb->getIntValue("STARTTIME")))
       {
          // if difference < 2 minutes adjust silent
 
-         if (std::abs(timerDb->getIntValue("_STARTTIME") - useeventsDb->getIntValue("STARTTIME")) > 2*tmeSecondsPerMinute)
+         if (std::abs(timerDb->getIntValue("EVTSTARTTIME") - useeventsDb->getIntValue("STARTTIME")) > 2*tmeSecondsPerMinute)
             parent->message(0, 'I', "EPGD: Timer action", "Info: Starttime of event (%ld) '%s' changed from '%s' to '%s', updating timer (%ld)",
                             timerDb->getIntValue("EVENTID"), useeventsDb->getStrValue("TITLE"),
-                            l2pTime(timerDb->getIntValue("_STARTTIME")).c_str(), l2pTime(useeventsDb->getIntValue("STARTTIME")).c_str(),
+                            l2pTime(timerDb->getIntValue("EVTSTARTTIME")).c_str(), l2pTime(useeventsDb->getIntValue("STARTTIME")).c_str(),
                             timerDb->getIntValue("ID"));
 
          modifyTimer(timerDb, timerDb->hasCharValue("ACTION", taCreate) ? taCreate : taAdjust);
@@ -1337,7 +1337,8 @@ int cSearchTimer::createTimer(int id)
    timerRow.setValue("TYPE", searchtimerDb->getStrValue("TYPE"));
    timerRow.setValue("SOURCE", "epgd");
    timerRow.setValue("EVENTID", useeventsDb->getIntValue("USEID"));
-   timerRow.setValue("_STARTTIME", useeventsDb->getIntValue("STARTTIME"));
+//    timerRow.setValue("_STARTTIME", useeventsDb->getIntValue("STARTTIME"));
+   timerRow.setValue("EVTSTARTTIME", useeventsDb->getIntValue("STARTTIME"));
    timerRow.setValue("CHANNELID", useeventsDb->getStrValue("CHANNELID"));
    timerRow.setValue("NAMINGMODE", namingmode);
    timerRow.setValue("TEMPLATE", tmplExpression);
diff --git a/webstore.c b/webstore.c
index be6f8b2..c11d96c 100644
--- a/webstore.c
+++ b/webstore.c
@@ -339,7 +339,8 @@ int cEpgHttpd::storeTimerJob(json_t* jInData, json_t* response)
       if (eventid != na)
       {
          timerRow.setValue("EVENTID", eventid);
-         timerRow.setValue("_STARTTIME", eventStartTime);
+         // timerRow.setValue("_STARTTIME", eventStartTime);
+         timerRow.setValue("EVTSTARTTIME", eventStartTime);
          timerRow.setValue("_ENDTIME", eventEndTime);
       }