From e91074c81236fbfb803ffbbd8ca5c62d183fb196 Mon Sep 17 00:00:00 2001 From: Glenn-1990 Date: Tue, 3 Mar 2015 15:17:00 +0100 Subject: [PATCH] set mux satpos from network satpos if set --- src/input/mpegts/mpegts_mux_dvb.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/input/mpegts/mpegts_mux_dvb.c b/src/input/mpegts/mpegts_mux_dvb.c index 010267f1..53bc021c 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; }