From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 22 Dec 2017 07:28:52 +0000 (+0100)
Subject: DVR: fix the dvr_entry_is_finished() for new dvr_entry_is_completed_ok()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9349a35f6f323f4ce16a7c04dda443504bf3dda2;p=thirdparty%2Ftvheadend.git

DVR: fix the dvr_entry_is_finished() for new dvr_entry_is_completed_ok()
---

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index cbf027eb0..5dad5e139 100644
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -157,9 +157,12 @@ int dvr_entry_is_finished(dvr_entry_t *entry, int flags)
                  dvr_get_filesize(entry, 0) < 0);		/* Removed externally? */
   int success = entry->de_sched_state == DVR_COMPLETED;
 
-  if (success && !dvr_entry_is_completed_ok(entry))
-    success = entry->de_last_error == SM_CODE_OK &&
-              entry->de_data_errors < DVR_MAX_DATA_ERRORS;
+  if (success) {
+    if (entry->de_last_error == SM_CODE_OK)
+      success = entry->de_data_errors < DVR_MAX_DATA_ERRORS;
+    else
+      success = dvr_entry_is_completed_ok(entry);
+  }
 
   if ((flags & DVR_FINISHED_REMOVED_SUCCESS) && removed && success)
     return 1;