From: Glenn-1990 <g_christiaensen@msn.com>
Date: Fri, 4 Nov 2016 14:37:48 +0000 (+0100)
Subject: Duplicate detection doesn't honor disabled timers
X-Git-Tag: v4.2.1~205
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c2cfc672c2af7abce69ca15ed59642197ed21be;p=thirdparty%2Ftvheadend.git

Duplicate detection doesn't honor disabled timers
---

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index e1ec10306..7e51a6ec3 100644
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -1294,14 +1294,22 @@ static dvr_entry_t *_dvr_duplicate_event(dvr_entry_t *de)
       if (de == de2)
         continue;
 
+      // check for valid states
+      if (de2->de_sched_state == DVR_NOSTATE ||
+          de2->de_sched_state == DVR_MISSED_TIME)
+        continue;
+
       // only earlier recordings qualify as master
       if (de2->de_start > de->de_start)
         continue;
 
+      // only enabled upcoming recordings
+      if (de2->de_sched_state == DVR_SCHEDULED && !de2->de_enabled)
+        continue;
+
       // only successful earlier recordings qualify as master
-      if (de2->de_sched_state == DVR_MISSED_TIME ||
-          (de2->de_sched_state == DVR_COMPLETED &&
-           de2->de_last_error != SM_CODE_OK))
+      if ((de2->de_sched_state == DVR_COMPLETED || de2->de_sched_state == DVR_RECORDING) &&
+          de2->de_last_error != SM_CODE_OK)
         continue;
 
       // if titles are not defined or do not match, don't dedup
@@ -1318,14 +1326,22 @@ static dvr_entry_t *_dvr_duplicate_event(dvr_entry_t *de)
       if (de == de2)
         continue;
 
+      // check for valid states
+      if (de2->de_sched_state == DVR_NOSTATE ||
+          de2->de_sched_state == DVR_MISSED_TIME)
+        continue;
+
       // only earlier recordings qualify as master
       if (de2->de_start > de->de_start)
         continue;
 
+      // only enabled upcoming recordings
+      if (de2->de_sched_state == DVR_SCHEDULED && !de2->de_enabled)
+        continue;
+
       // only successful earlier recordings qualify as master
-      if (de2->de_sched_state == DVR_MISSED_TIME ||
-          (de2->de_sched_state == DVR_COMPLETED &&
-           de2->de_last_error != SM_CODE_OK))
+      if ((de2->de_sched_state == DVR_COMPLETED || de2->de_sched_state == DVR_RECORDING) &&
+          de2->de_last_error != SM_CODE_OK)
         continue;
 
       // if titles are not defined or do not match, don't dedup