From a28861f1303d7c73204469192a018a504803a730 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 25 May 2017 14:37:10 +0200 Subject: [PATCH] mpegts network scan: do not disable inputs for user scan + init scan combos, fixes #4386 --- src/input/mpegts/mpegts_input.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c index b8178808e..0501f4c7d 100644 --- a/src/input/mpegts/mpegts_input.c +++ b/src/input/mpegts/mpegts_input.c @@ -375,10 +375,12 @@ mpegts_input_is_enabled { if ((flags & SUBSCRIPTION_EPG) != 0 && !mi->mi_ota_epg) return MI_IS_ENABLED_NEVER; - if ((flags & SUBSCRIPTION_INITSCAN) != 0 && !mi->mi_initscan) - return MI_IS_ENABLED_NEVER; - if ((flags & SUBSCRIPTION_IDLESCAN) != 0 && !mi->mi_idlescan) - return MI_IS_ENABLED_NEVER; + if ((flags & SUBSCRIPTION_USERSCAN) == 0) { + if ((flags & SUBSCRIPTION_INITSCAN) != 0 && !mi->mi_initscan) + return MI_IS_ENABLED_NEVER; + if ((flags & SUBSCRIPTION_IDLESCAN) != 0 && !mi->mi_idlescan) + return MI_IS_ENABLED_NEVER; + } return mi->mi_enabled ? MI_IS_ENABLED_OK : MI_IS_ENABLED_NEVER; } -- 2.47.2