From: Jaroslav Kysela Date: Wed, 16 Mar 2016 16:29:57 +0000 (+0100) Subject: linuxdvb: master/slave - prefer master tuners X-Git-Tag: v4.2.1~849 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b9e1b8afdd17290c6cf4c881d685706b9771b6d;p=thirdparty%2Ftvheadend.git linuxdvb: master/slave - prefer master tuners --- diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c index ec5bb296f..89e5fe4aa 100644 --- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c +++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c @@ -485,6 +485,8 @@ linuxdvb_frontend_is_enabled ( mpegts_input_t *mi, mpegts_mux_t *mm, int flags ) if (lfe->lfe_master && !strcmp(lfe->lfe_master, idnode_uuid_as_str(&lfe2->ti_id, ubuf))) { if (lfe2->lfe_satconf == NULL) return 0; /* invalid master */ + if (lfe2->lfe_refcount <= 0) + return 0; /* prefer master */ return linuxdvb_satconf_match_mux(lfe2->lfe_satconf, mm); } if (lfe2->lfe_master &&