fix crash

tvheadend · Dec 20, 2016 · e1181b2 · e1181b2
1 parent 23bf955
commit e1181b2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;