DVR: handle enable flag at start of a recording, fixes #3104

tvheadend · Oct 6, 2015 · b51867f · b51867f
1 parent 3840b03
commit b51867f
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
@@ -381,11 +381,7 @@ dvr_entry_set_timer(dvr_entry_t *de)
   start = dvr_entry_get_start_time(de);
   stop  = dvr_entry_get_stop_time(de);
 
-  if(!de->de_enabled) {
-
-    dvr_entry_completed(de, de->de_last_error);
-
-  } else if(now >= stop || de->de_dont_reschedule) {
+  if (now >= stop || de->de_dont_reschedule) {
 
     if(htsmsg_is_empty(de->de_files))
       dvr_entry_missed_time(de, de->de_last_error);
@@ -1276,6 +1272,11 @@ dvr_entry_start_recording(dvr_entry_t *de, int clone)
 {
   int r;
 
+  if (!de->de_enabled) {
+    dvr_entry_missed_time(de, SM_CODE_SVC_NOT_ENABLED);
+    return;
+  }
+
   dvr_entry_set_state(de, DVR_RECORDING, DVR_RS_PENDING, SM_CODE_OK);
 
   tvhlog(LOG_INFO, "dvr", "\"%s\" on \"%s\" recorder starting",