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

This commit is contained in:
Adam Sutton 2012-10-09 11:47:41 +01:00
parent aff490c6b2
commit 1d7fd005e0

View file

@ -237,7 +237,8 @@ dvb_transport_load(th_dvb_mux_instance_t *tdmi)
psi_load_service_settings(c, t);
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;
s = htsmsg_get_str(c, "default_authority");