From e2b91b3e37a08982e0c0f0227a90eae79aef54a3 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Wed, 11 Jun 2014 01:02:22 +0100 Subject: [PATCH] mpegts network_scan: fix problem with active muxes being re-added to scan Q --- src/input/mpegts/mpegts_mux.c | 3 +++ src/input/mpegts/mpegts_network_scan.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c index 8002183e..698b147e 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 10d5c894..fb763087 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); }