DVR: Fix the start conditions and do early stop properly, fixes #3228

tvheadend · Oct 30, 2015 · 2cab577 · 2cab577
1 parent b62e1bd
commit 2cab577
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
@@ -1585,10 +1585,10 @@ void dvr_event_running(epg_broadcast_t *e, epg_source_t esrc, int running)
                epg_broadcast_get_title(e, NULL),
                channel_get_name(e->channel));
     de->de_running_stop = dispatch_clock;
-    if (de->de_sched_state == DVR_RECORDING) {
+    if (de->de_sched_state == DVR_RECORDING && de->de_running_start) {
       if (dvr_entry_get_stop_time(de) > dispatch_clock) {
         de->de_dont_reschedule = 1;
-        dvr_entry_set_timer(de);
+        dvr_stop_recording(de, SM_CODE_OK, 0, 0);
         tvhdebug("dvr", "dvr entry %s event %s on %s - EPG stop",
                idnode_uuid_as_sstr(&de->de_id),
                epg_broadcast_get_title(e, NULL),

diff --git a/src/epggrab/module/eit.c b/src/epggrab/module/eit.c
@@ -550,6 +550,8 @@ static int _eit_process_event_one
   /* use running flag only for current broadcast */
   if (running && tableid == 0x4e && sect == 0)
     epg_broadcast_notify_running(ebc, EPG_SOURCE_EIT, running == 4);
+  if (running && running != 4 && tableid == 0x4e && sect == 1)
+    epg_broadcast_notify_running(ebc, EPG_SOURCE_EIT, 0);
 
   return 0;
 }