Revert "dvr: handle EPG running state correctly, fixes #4017"

This reverts commit 22cf3b4.
tvheadend · Oct 12, 2016 · 704102b · 704102b
1 parent 91c4fa1
commit 704102b
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
@@ -1894,22 +1894,19 @@ void dvr_event_running(epg_broadcast_t *e, epg_source_t esrc, epg_running_t runn
                  idnode_uuid_as_str(&de->de_id, ubuf),
                  epg_broadcast_get_title(e, NULL),
                  channel_get_name(e->channel));
-        if (dvr_entry_get_epg_running(de))
-          atomic_set_time_t(&de->de_running_pause, 0);
+        atomic_set_time_t(&de->de_running_pause, 0);
         atomic_add(&de->de_running_change, 1);
       }
       if (!de->de_running_start) {
         tvhdebug(LS_DVR, "dvr entry %s event %s on %s - EPG marking start",
                  idnode_uuid_as_str(&de->de_id, ubuf),
                  epg_broadcast_get_title(e, NULL),
                  channel_get_name(e->channel));
-        if (dvr_entry_get_epg_running(de))
-          atomic_set_time_t(&de->de_running_start, gclk());
+        atomic_set_time_t(&de->de_running_start, gclk());
         atomic_add(&de->de_running_change, 1);
       }
       if (dvr_entry_get_start_time(de, 1) > gclk()) {
-        if (dvr_entry_get_epg_running(de))
-          atomic_set_time_t(&de->de_start, gclk());
+        atomic_set_time_t(&de->de_start, gclk());
         atomic_add(&de->de_running_change, 1);
         dvr_entry_set_timer(de);
         tvhdebug(LS_DVR, "dvr entry %s event %s on %s - EPG start",
@@ -1936,10 +1933,8 @@ void dvr_event_running(epg_broadcast_t *e, epg_source_t esrc, epg_running_t runn
                  epg_broadcast_get_title(e, NULL),
                  channel_get_name(de->de_channel));
       }
-      if (dvr_entry_get_epg_running(de)) {
-        atomic_set_time_t(&de->de_running_stop, gclk());
-        atomic_set_time_t(&de->de_running_pause, 0);
-      }
+      atomic_set_time_t(&de->de_running_stop, gclk());
+      atomic_set_time_t(&de->de_running_pause, 0);
       if (de->de_sched_state == DVR_RECORDING && de->de_running_start) {
         dvr_stop_recording(de, SM_CODE_OK, 0, 0);
         tvhdebug(LS_DVR, "dvr entry %s %s %s on %s - EPG stop",
@@ -1953,8 +1948,7 @@ void dvr_event_running(epg_broadcast_t *e, epg_source_t esrc, epg_running_t runn
                  idnode_uuid_as_str(&de->de_id, ubuf),
                  epg_broadcast_get_title(e, NULL),
                  channel_get_name(e->channel));
-        if (dvr_entry_get_epg_running(de))
-          atomic_set_time_t(&de->de_running_pause, gclk());
+        atomic_set_time_t(&de->de_running_pause, gclk());
         atomic_add(&de->de_running_change, 1);
       }
     }