]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
programs with non zero and equal episode numbers are considered duplicates 300/head
authorJohan Rehnberg <cleanrock@gmail.com>
Sun, 13 Oct 2013 18:15:15 +0000 (20:15 +0200)
committerJohan Rehnberg <cleanrock@gmail.com>
Sun, 13 Oct 2013 18:15:15 +0000 (20:15 +0200)
src/dvr/dvr_db.c

index fd54d3a046c37c896e208c2a738aa1fbe748cd03..2129f23231cf6d3400d8f9b4e6670b8a975dce37 100644 (file)
@@ -427,11 +427,23 @@ dvr_entry_create_by_event(const char *config_name,
                            creator, dae, pri);
 }
 
+/**
+ * Considered a duplicate if it has episode numbers and it is equal to an existing recording
+ */
 static int _dvr_duplicate_event ( epg_broadcast_t *e )
 {
   dvr_entry_t *de;
+  epg_episode_num_t empty_epnum;
+
+  memset(&empty_epnum, 0, sizeof(empty_epnum));
+  if (epg_episode_number_cmp(&empty_epnum, &e->episode->epnum) == 0)
+    return 0;
+
   LIST_FOREACH(de, &dvrentries, de_global_link) {
-    if (de->de_bcast && (de->de_bcast->episode == e->episode)) return 1;
+    if (de->de_bcast && epg_episode_number_cmp(&de->de_bcast->episode->epnum, &e->episode->epnum) == 0)
+    {
+      return 1;
+    }
   }
   return 0;
 }