From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 27 May 2015 15:42:02 +0000 (+0200)
Subject: mpegts: linked inputs - another bugfix
X-Git-Tag: v4.2.1~2441
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f63da9d87332bcc4ad07e4778574738929a87e98;p=thirdparty%2Ftvheadend.git

mpegts: linked inputs - another bugfix
---

diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index b41445391..363c0f489 100644
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -136,7 +136,7 @@ mpegts_mux_subscribe_keep
   mi->mi_linked = NULL;
   tvhtrace("mpegts", "subscribe keep for '%s' (%p)", mi->mi_name, mm);
   r = mpegts_mux_subscribe(mm, mi, "keep", SUBSCRIPTION_PRIO_KEEP,
-                           SUBSCRIPTION_RESTART | SUBSCRIPTION_MINIMAL);
+                           SUBSCRIPTION_ONESHOT | SUBSCRIPTION_MINIMAL);
   mi->mi_linked = s;
   return r;
 }
diff --git a/src/input/mpegts/mpegts_network_scan.c b/src/input/mpegts/mpegts_network_scan.c
index debeb2ced..ff800f1fd 100644
--- a/src/input/mpegts/mpegts_network_scan.c
+++ b/src/input/mpegts/mpegts_network_scan.c
@@ -47,7 +47,7 @@ mpegts_network_scan_timer_cb ( void *p )
   /* Process Q */
   for (mm = TAILQ_FIRST(&mn->mn_scan_pend); mm != NULL; mm = nxt) {
     nxt = TAILQ_NEXT(mm, mm_scan_link);
-    assert(mm->mm_scan_state == MM_SCAN_STATE_PEND);
+    assert(mm->mm_scan_state == MM_SCAN_STATE_PEND || mm->mm_scan_state == MM_SCAN_STATE_ACTIVE);
 
     /* Don't try to subscribe already tuned muxes */
     if (mm->mm_active) continue;