From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 20 Oct 2015 13:15:36 +0000 (+0200)
Subject: bouquet: fix the enable/disable sequence and channel numbering, fixes #3177
X-Git-Tag: v4.2.1~1859
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95ebcd22bfe4be65346ce3cab2eb515f63ff685e;p=thirdparty%2Ftvheadend.git

bouquet: fix the enable/disable sequence and channel numbering, fixes #3177
---

diff --git a/src/bouquet.c b/src/bouquet.c
index 2d95d59dd..43ab8055e 100644
--- a/src/bouquet.c
+++ b/src/bouquet.c
@@ -637,6 +637,8 @@ bouquet_class_rescan_notify0 ( bouquet_t *bq, const char *lang )
   if (bq->bq_src && strncmp(bq->bq_src, "iptv-network://", 15) == 0)
     return iptv_bouquet_trigger_by_uuid(bq->bq_src + 15);
 #endif
+  if (bq->bq_src && strncmp(bq->bq_src, "exturl://", 9) == 0)
+    return bouquet_download_trigger(bq);
   mpegts_mux_bouquet_rescan(bq->bq_src, bq->bq_comment);
   bq->bq_rescan = 0;
 }
@@ -1075,7 +1077,7 @@ service:
         if (lv == 0) {
           service_t *s = mpegts_service_find_e2(stype, sid, tsid, onid, hash);
           if (s)
-            bouquet_add_service(bq, s, ++seen, tagname);
+            bouquet_add_service(bq, s, ((int64_t)++seen) * CHANNEL_SPLIT, tagname);
         } else if (lv == 64) {
           tagname = name;
         }