From: Jaroslav Kysela Date: Tue, 14 Mar 2017 09:58:15 +0000 (+0100) Subject: server name access cleanups, fixes #4281 X-Git-Tag: v4.2.1~77 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3a2f9ef056f2b5649fec264a4a8694eeec54993;p=thirdparty%2Ftvheadend.git server name access cleanups, fixes #4281 --- diff --git a/src/config.c b/src/config.c index 59ca041c5..9bf31bf0e 100644 --- a/src/config.c +++ b/src/config.c @@ -2396,7 +2396,7 @@ const idclass_t config_class = { const char *config_get_server_name ( void ) { - return config.server_name; + return config.server_name ?: "Tvheadend"; } const char *config_get_language ( void ) diff --git a/src/webui/extjs.c b/src/webui/extjs.c index 24bcd0242..7ecd6ee8c 100644 --- a/src/webui/extjs.c +++ b/src/webui/extjs.c @@ -135,7 +135,7 @@ Ext.onReady(tvheadend.app.init, tvheadend.app);\ "}\n" "\n" ""); - htsbuf_append_str(hq, config.server_name); + htsbuf_append_str(hq, config_get_server_name()); htsbuf_append_str(hq, "\n" "\n" @@ -161,7 +161,7 @@ extjs_livetv(http_connection_t *hc, const char *remain, void *opaque) htsbuf_append_str(hq, "\n"); htsbuf_append_str(hq, "\n"); htsbuf_append_str(hq, ""); - htsbuf_append_str(hq, config.server_name); + htsbuf_append_str(hq, config_get_server_name()); htsbuf_append_str(hq, "\n"); if (tvheadend_webui_debug) { diff --git a/src/webui/xmltv.c b/src/webui/xmltv.c index e1b532e65..54da0452e 100644 --- a/src/webui/xmltv.c +++ b/src/webui/xmltv.c @@ -45,7 +45,7 @@ http_xmltv_begin(htsbuf_queue_t *hq) \n"); }