stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mpegts network discovery: don't allow to modify mux parameters when discovery is not enabled in network config

Browse source
This commit is contained in:
Jaroslav Kysela 2014-08-12 17:40:41 +02:00
parent 81c08e2657
commit 34dd2b8da8
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/input/mpegts/mpegts_network_dvb.c
View file

@ -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;