]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
add streaming error for active recordings
authorGlenn-1990 <g_christiaensen@msn.com>
Thu, 5 Mar 2015 11:26:51 +0000 (12:26 +0100)
committerJaroslav Kysela <perex@perex.cz>
Mon, 9 Mar 2015 15:17:23 +0000 (16:17 +0100)
src/dvr/dvr_rec.c
src/htsp_server.c

index 53682834e574fe4b613d96c4544b28a6f4e14f00..54ad9080b1bc81e140fd967c6dd9e3fc224bd186 100644 (file)
@@ -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);
   }
 }
 
index 1418077e7487ba62d4238dfdb6edd8ef0abf0d5e..f61b92353a30cdefcd50c80d74923f99db975bbd 100644 (file)
@@ -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: