From: Adam Sutton <dev@adamsutton.me.uk>
Date: Wed, 11 Jun 2014 00:02:22 +0000 (+0100)
Subject: mpegts network_scan: fix problem with active muxes being re-added to scan Q
X-Git-Tag: v4.1~1937
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2b91b3e37a08982e0c0f0227a90eae79aef54a3;p=thirdparty%2Ftvheadend.git

mpegts network_scan: fix problem with active muxes being re-added to scan Q
---

diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index 8002183ef..698b147ec 100644
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -661,6 +661,9 @@ mpegts_mux_stop ( mpegts_mux_t *mm, int force )
 
   /* Scanning */
   mpegts_network_scan_mux_cancel(mm, 1);
+  if (mm->mm_scan_state == MM_SCAN_STATE_IDLE &&
+      mm->mm_network->mn_idlescan)
+    mpegts_network_scan_queue_add(mm, SUBSCRIPTION_PRIO_SCAN_IDLE);
 
   /* Events */
   mpegts_fire_event(mm, ml_mux_stop);
diff --git a/src/input/mpegts/mpegts_network_scan.c b/src/input/mpegts/mpegts_network_scan.c
index 10d5c8945..fb763087e 100644
--- a/src/input/mpegts/mpegts_network_scan.c
+++ b/src/input/mpegts/mpegts_network_scan.c
@@ -124,8 +124,6 @@ mpegts_network_scan_mux_done0
   }
 
   /* Re-enable? */
-  if (mm->mm_network->mn_idlescan && !weight)
-    weight = SUBSCRIPTION_PRIO_SCAN_IDLE;
   if (weight > 0)
     mpegts_network_scan_queue_add(mm, weight);
 }