From: TheTroll <trolldev@gmail.com>
Date: Tue, 23 Aug 2016 20:57:01 +0000 (+0200)
Subject: Fix Approx satip match (pola is mandatory)
X-Git-Tag: v4.2.1~354
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2fd542c9e397970e0b09d108724112276863831;p=thirdparty%2Ftvheadend.git

Fix Approx satip match (pola is mandatory)
---

diff --git a/src/input/mpegts/mpegts_network_dvb.c b/src/input/mpegts/mpegts_network_dvb.c
index b8239ed66..bf433e622 100644
--- a/src/input/mpegts/mpegts_network_dvb.c
+++ b/src/input/mpegts/mpegts_network_dvb.c
@@ -539,6 +539,9 @@ dvb_network_find_mux
     /* Reject if not same symbol rate (some tolerance due to changes and diff in NIT) */
     if (dvb_network_check_symbol_rate(lm, dmc, deltar)) continue;
 
+    /* Reject if not same polarisation */
+    if (lm->lm_tuning.u.dmc_fe_qpsk.polarisation != dmc->u.dmc_fe_qpsk.polarisation) continue;
+
     /* DVB-S extra checks */
     if (!approx_match && (lm->lm_tuning.dmc_fe_type == DVB_TYPE_S)) {
 
@@ -550,9 +553,6 @@ dvb_network_find_mux
       /* Same FEC */
       if (lm->lm_tuning.u.dmc_fe_qpsk.fec_inner != dmc->u.dmc_fe_qpsk.fec_inner) continue;
 
-      /* Same polarisation */
-      if (lm->lm_tuning.u.dmc_fe_qpsk.polarisation != dmc->u.dmc_fe_qpsk.polarisation) continue;
-
       /* Same orbital position */
       if (dvb_network_check_orbital_pos(lm->lm_tuning.u.dmc_fe_qpsk.orbital_pos,
                                         dmc->u.dmc_fe_qpsk.orbital_pos)) continue;