Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
mpegts network discovery: don't allow to modify mux parameters when d…
…iscovery is not enabled in network config
  • Loading branch information
perexg committed Aug 12, 2014
1 parent 81c08e2 commit 34dd2b8
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/input/mpegts/mpegts_network_dvb.c
Expand Up @@ -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 */
Expand Down Expand Up @@ -477,11 +477,10 @@ dvb_network_create_mux
}
#endif
}
if (mm) {
if (mm && save) {

This comment has been minimized.

Copy link
@ksooo

ksooo Aug 20, 2014

Contributor

@perexg This leads to very strange behaviour on my system (dual-tuner svb-s/-s2). For certain services which work fine with older tvh versions I now always get "No transponer available for ..." error log entries and of course those services will not be tuned annymore. Only way out is to restart tvh. Reverting this and the related change some lines below fixes the problem reliably.

This comment has been minimized.

Copy link
@perexg

perexg Aug 20, 2014

Author Contributor

@ksooo : Trying to find something related but failing. I think that the real culprit is somewhere else...

This comment has been minimized.

Copy link
@ksooo

ksooo via email Oct 6, 2014

Contributor
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;
Expand Down

0 comments on commit 34dd2b8

Please sign in to comment.