]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Fix: Rerecord an event added as "previously recorded" if an start time change occurs...
authorpablozg <pablozg@gmail.com>
Mon, 15 Jan 2018 09:25:25 +0000 (10:25 +0100)
committerJaroslav Kysela <perex@perex.cz>
Tue, 16 Jan 2018 10:06:51 +0000 (11:06 +0100)
src/dvr/dvr_db.c

index 3e8760595a301e7c004847dab44b4c2bb92a103b..17af2a43da1bd1811d9ad11bccac178b59893765 100644 (file)
@@ -1613,7 +1613,7 @@ static dvr_entry_t *_dvr_duplicate_event(dvr_entry_t *de)
         continue;
 
       // only earlier recordings qualify as master
-      if (de2->de_start > de->de_start)
+      if (de2->de_start > de->de_start && de2->de_last_error != SM_CODE_PREVIOUSLY_RECORDED)
         continue;
 
       // only enabled upcoming recordings
@@ -1644,7 +1644,7 @@ static dvr_entry_t *_dvr_duplicate_event(dvr_entry_t *de)
         continue;
 
       // only earlier recordings qualify as master
-      if (de2->de_start > de->de_start)
+      if (de2->de_start > de->de_start && de2->de_last_error != SM_CODE_PREVIOUSLY_RECORDED)
         continue;
 
       // only enabled upcoming recordings