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

[PR-155] Ensure any existing configuration is honoured.

Browse source
This commit is contained in:
Adam Sutton 2012-10-09 11:47:41 +01:00
parent aff490c6b2
commit 1d7fd005e0
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dvb/dvb_transport.c
View file

@ -237,7 +237,8 @@ dvb_transport_load(th_dvb_mux_instance_t *tdmi)
psi_load_service_settings(c, t); psi_load_service_settings(c, t);
pthread_mutex_unlock(&t->s_stream_mutex); pthread_mutex_unlock(&t->s_stream_mutex);
s = htsmsg_get_str(c, "dvb_charset"); if (!(s = htsmsg_get_str(c, "dvb_charset")))
s = htsmsg_get_str(c, "dvb_default_charset");
t->s_dvb_charset = s ? strdup(s) : NULL; t->s_dvb_charset = s ? strdup(s) : NULL;
s = htsmsg_get_str(c, "default_authority"); s = htsmsg_get_str(c, "default_authority");