]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
DVR: fix the dvr_entry_is_finished() for new dvr_entry_is_completed_ok()
authorJaroslav Kysela <perex@perex.cz>
Fri, 22 Dec 2017 07:28:52 +0000 (08:28 +0100)
committerJaroslav Kysela <perex@perex.cz>
Fri, 22 Dec 2017 07:28:52 +0000 (08:28 +0100)
src/dvr/dvr_db.c

index cbf027eb0e0ef643bc77a7bc96becf206eb9735a..5dad5e1399672dbbc0588b94d5c27a0167ec0037 100644 (file)
@@ -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;