From 1d7fd005e02d608d9d75e59f813ec6449579f1d4 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Tue, 9 Oct 2012 11:47:41 +0100 Subject: [PATCH] [PR-155] Ensure any existing configuration is honoured. --- src/dvb/dvb_transport.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dvb/dvb_transport.c b/src/dvb/dvb_transport.c index cf27b231..e586a47f 100644 --- a/src/dvb/dvb_transport.c +++ b/src/dvb/dvb_transport.c @@ -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");