]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
epggrab: match off channel major/minor in addition to name
authorBen Fennema <fennema@google.com>
Sun, 22 Mar 2015 17:09:16 +0000 (10:09 -0700)
committerJaroslav Kysela <perex@perex.cz>
Sun, 22 Mar 2015 17:18:23 +0000 (18:18 +0100)
src/epggrab/channel.c

index afc23c047a1c3a6ff843c97c709477ef57f09687..7f9c68166ea4cb45703c60ddca5d8fce57d9c31d 100644 (file)
@@ -40,6 +40,8 @@ int epggrab_channel_match ( epggrab_channel_t *ec, channel_t *ch )
   if (LIST_FIRST(&ec->channels)) return 0; // ignore already paired
 
   if (ec->name && !strcmp(ec->name, channel_get_name(ch))) return 1;
+  int64_t number = channel_get_number(ch);
+  if ((ec->major || ec->minor) && ec->major == channel_get_major(number) && ec->minor == channel_get_minor(number)) return 1;
   return 0;
 }