Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
Showing
1 changed file
with
3 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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) { | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
perexg
Author
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; | ||
|
|
||
@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.