Merge branch 'dev' of projects.vdr-developer.org:vdr-plugin-epg2vdr into dev

* 'dev' of projects.vdr-developer.org:vdr-plugin-epg2vdr:
  dev

2 files changed, 4 insertions, 0 deletions

diff --git a/epg2vdr.c b/epg2vdr.c
index c51cc7e..a53a3f8 100644
--- a/epg2vdr.c
+++ b/epg2vdr.c
@@ -473,6 +473,9 @@ int cPluginEPG2VDR::initDb()
    //    where
    //          (t.state in ('P','R') or t.state is null)
    //      and t.vdruuid = v.uuid
+   //      and t.type = 'R'
+   //      and t.vdruuid = v.uuid
+   //     order by _starttime
 
    selectTimers = new cDbStatement(timerDb);
 
diff --git a/ttools.c b/ttools.c
index 5b2d9d8..f48135d 100644
--- a/ttools.c
+++ b/ttools.c
@@ -332,6 +332,7 @@ int updateRowByTimer(cDbRow* timerRow, const cTimer* t)
    timerRow->setValue("VDRUUID", Epg2VdrConfig.uuid);
    timerRow->setValue("EVENTID", t->Event() ? (long)t->Event()->EventID() : 0);
    timerRow->setValue("_STARTTIME", t->Event() ? t->Event()->StartTime() : 0);
+   timerRow->setValue("_ENDTIME", t->Event() ? t->StopTime() : 0);
    timerRow->setValue("CHANNELID", channelId);
    timerRow->setValue("DAY", t->Day());
    timerRow->setValue("STARTTIME", t->Start());