From: Glenn-1990 <g_christiaensen@msn.com>
Date: Tue, 3 Mar 2015 14:17:00 +0000 (+0100)
Subject: set mux satpos from network satpos if set
X-Git-Tag: v4.1~336
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e91074c81236fbfb803ffbbd8ca5c62d183fb196;p=thirdparty%2Ftvheadend.git

set mux satpos from network satpos if set
---

diff --git a/src/input/mpegts/mpegts_mux_dvb.c b/src/input/mpegts/mpegts_mux_dvb.c
index 010267f15..53bc021c9 100644
--- a/src/input/mpegts/mpegts_mux_dvb.c
+++ b/src/input/mpegts/mpegts_mux_dvb.c
@@ -793,9 +793,15 @@ dvb_mux_create0
     htsmsg_destroy(c);
   }
 
-  /* Update the satellite position for the network settings */
-  if (ln->mn_satpos == INT_MAX && lm->lm_tuning.u.dmc_fe_qpsk.orbital_pos != INT_MAX)
-    ln->mn_satpos = lm->lm_tuning.u.dmc_fe_qpsk.orbital_pos;
+  if (ln->mn_satpos == INT_MAX) {
+    /* Update the satellite position for the network settings */
+    if (lm->lm_tuning.u.dmc_fe_qpsk.orbital_pos != INT_MAX)
+      ln->mn_satpos = lm->lm_tuning.u.dmc_fe_qpsk.orbital_pos;
+  }
+  else {
+    /* Update the satellite position for the mux setting */
+    lm->lm_tuning.u.dmc_fe_qpsk.orbital_pos = ln->mn_satpos;
+  }
 
   return lm;
 }