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 8002183ef6d204c8f2e0be0b5dfab594583f8da7..698b147ec18790fca4dbf41cb8e29231a4ec42d6 100644 (file)
--- 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 10d5c89453d353016d59258e2aedcb6a190e96ed..fb763087e05d061bea40898c2da0b1b41ef48989 100644 (file)
--- 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);
 }