From: Glenn-1990 <g_christiaensen@msn.com>
Date: Sun, 18 Dec 2016 16:22:22 +0000 (+0100)
Subject: fix crash
X-Git-Tag: v4.2.1~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1181b2cabf4fbab6377d8c02cabd2b315eef512;p=thirdparty%2Ftvheadend.git

fix crash
---

diff --git a/src/htsp_server.c b/src/htsp_server.c
index 29575b994..2f6274e74 100644
--- a/src/htsp_server.c
+++ b/src/htsp_server.c
@@ -1311,7 +1311,8 @@ htsp_method_authenticate(htsp_connection_t *htsp, htsmsg_t *in)
     htsmsg_add_u32(r, "limitstreaming", htsp->htsp_granted_access->aa_conn_limit_streaming);
     htsmsg_add_u32(r, "uilevel",        htsp->htsp_granted_access->aa_uilevel == UILEVEL_DEFAULT ?
         config.uilevel : htsp->htsp_granted_access->aa_uilevel);
-    htsmsg_add_str(r, "uilanguage",     htsp->htsp_granted_access->aa_lang_ui);
+    htsmsg_add_str(r, "uilanguage",     htsp->htsp_granted_access->aa_lang_ui ?
+        htsp->htsp_granted_access->aa_lang_ui : (config.language_ui ? config.language_ui : ""));
   }
   
   return r;