From dad47403e4410c9090c94d83c44045224735bf7e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sat, 13 May 2017 17:40:33 +0200 Subject: [PATCH] mpegts network scan: fix mux scan cancel operation, fixes #4373 --- src/input/mpegts/mpegts_network_scan.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/input/mpegts/mpegts_network_scan.c b/src/input/mpegts/mpegts_network_scan.c index 47f2b7d56..e6a3804f0 100644 --- a/src/input/mpegts/mpegts_network_scan.c +++ b/src/input/mpegts/mpegts_network_scan.c @@ -171,11 +171,14 @@ mpegts_network_scan_mux_partial ( mpegts_mux_t *mm ) void mpegts_network_scan_mux_cancel ( mpegts_mux_t *mm, int reinsert ) { - if (mm->mm_scan_state != MM_SCAN_STATE_ACTIVE) - return; - - if (!reinsert) + if (reinsert) { + if (mm->mm_scan_state != MM_SCAN_STATE_ACTIVE) + return; + } else { + if (mm->mm_scan_state == MM_SCAN_STATE_IDLE) + return; mm->mm_scan_flags = 0; + } mpegts_network_scan_mux_done0(mm, MM_SCAN_NONE, reinsert ? mm->mm_scan_weight : 0); -- 2.47.3