From 34dd2b8da8d61fc21e6e4497a34259601b9e365f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 12 Aug 2014 17:40:41 +0200 Subject: [PATCH] mpegts network discovery: don't allow to modify mux parameters when discovery is not enabled in network config --- src/input/mpegts/mpegts_network_dvb.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/input/mpegts/mpegts_network_dvb.c b/src/input/mpegts/mpegts_network_dvb.c index 0d390e96..bc87f60e 100644 --- a/src/input/mpegts/mpegts_network_dvb.c +++ b/src/input/mpegts/mpegts_network_dvb.c @@ -392,7 +392,7 @@ dvb_network_create_mux mm, buf, onid, tsid, mm->mm_network->mn_network_name); #endif } - } else if (mm) { + } else if (mm && ln->mn_autodiscovery) { dvb_mux_t *lm = (dvb_mux_t*)mm; /* the nit tables may be inconsistent (like rolloff ping-pong) */ /* accept information only from one origin mux */ @@ -477,11 +477,10 @@ dvb_network_create_mux } #endif } - if (mm) { + if (mm && save) { mm->mm_dmc_origin = mmo; mm->mm_dmc_origin_expire = dispatch_clock + 3600 * 24; /* one day */ - if (save) - mm->mm_config_save(mm); + mm->mm_config_save(mm); } noop: return mm;