From cde79eb75fca1c46896a7f355f7ebec6f0ee065c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 28 Dec 2014 16:16:41 +0100 Subject: [PATCH] dvb network scan: don't subscribe to already active mux, move Idle Scan to hidden (grid), fixes #2568 --- src/input/mpegts/mpegts_network.c | 2 +- src/input/mpegts/mpegts_network_scan.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/input/mpegts/mpegts_network.c b/src/input/mpegts/mpegts_network.c index 2604733c..3ec3df7e 100644 --- a/src/input/mpegts/mpegts_network.c +++ b/src/input/mpegts/mpegts_network.c @@ -172,7 +172,7 @@ const idclass_t mpegts_network_class = .off = offsetof(mpegts_network_t, mn_idlescan), .def.i = 0, .notify = mpegts_network_class_idlescan_notify, - .opts = PO_ADVANCED, + .opts = PO_ADVANCED | PO_HIDDEN, }, { .type = PT_BOOL, diff --git a/src/input/mpegts/mpegts_network_scan.c b/src/input/mpegts/mpegts_network_scan.c index 93901ad1..646c80c7 100644 --- a/src/input/mpegts/mpegts_network_scan.c +++ b/src/input/mpegts/mpegts_network_scan.c @@ -49,6 +49,9 @@ mpegts_network_scan_timer_cb ( void *p ) nxt = TAILQ_NEXT(mm, mm_scan_link); assert(mm->mm_scan_state == MM_SCAN_STATE_PEND); + /* Don't try to subscribe already tuned muxes */ + if (mm->mm_active) continue; + /* Attempt to tune */ r = mpegts_mux_subscribe(mm, "scan", mm->mm_scan_weight, mm->mm_scan_flags);