From: Ben Fennema <fennema@google.com>
Date: Sun, 22 Mar 2015 17:09:16 +0000 (-0700)
Subject: epggrab: match off channel major/minor in addition to name
X-Git-Tag: v4.1~233
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5dc86b3dd32f80c337da75cc0d2e00702c45fe1;p=thirdparty%2Ftvheadend.git

epggrab: match off channel major/minor in addition to name
---

diff --git a/src/epggrab/channel.c b/src/epggrab/channel.c
index afc23c047..7f9c68166 100644
--- a/src/epggrab/channel.c
+++ b/src/epggrab/channel.c
@@ -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;
 }