add streaming error for active recordings

tvheadend · Mar 9, 2015 · 81ae6bf · 81ae6bf
1 parent a69ee15
commit 81ae6bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
@@ -318,6 +318,7 @@ dvr_notify(dvr_entry_t *de, int now)
   if (now || de->de_last_notify + 5 < dispatch_clock) {
     idnode_notify_simple(&de->de_id);
     de->de_last_notify = dispatch_clock;
+    htsp_dvr_entry_update(de);
   }
 }
 

diff --git a/src/htsp_server.c b/src/htsp_server.c
@@ -710,7 +710,8 @@ htsp_build_dvrentry(dvr_entry_t *de, const char *method)
     break;
   case DVR_RECORDING:
     s = "recording";
-    if (de->de_rec_state == DVR_RS_ERROR)
+    if (de->de_rec_state == DVR_RS_ERROR ||
+       (de->de_rec_state == DVR_RS_PENDING && de->de_last_error != SM_CODE_OK))
       error = streaming_code2txt(de->de_last_error);
     break;
   case DVR_COMPLETED: