From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 29 May 2015 16:39:43 +0000 (+0200)
Subject: HTSP: allow to remove language settings
X-Git-Tag: v4.2.1~2422
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec083c9bb21082ab59b216d9e32d428027d58965;p=thirdparty%2Ftvheadend.git

HTSP: allow to remove language settings
---

diff --git a/src/htsp_server.c b/src/htsp_server.c
index 48489e47a..2b828bf39 100644
--- a/src/htsp_server.c
+++ b/src/htsp_server.c
@@ -1080,8 +1080,14 @@ htsp_method_async(htsp_connection_t *htsp, htsmsg_t *in)
   htsmsg_get_u32(in, "epg", &epg);
   htsmsg_get_s64(in, "lastUpdate", &lastUpdate);
   htsmsg_get_s64(in, "epgMaxTime", &epgMaxTime);
-  if ((lang = htsmsg_get_str(in, "language")))
-    htsp->htsp_language = strdup(lang);
+  if ((lang = htsmsg_get_str(in, "language")) != NULL) {
+    if (lang[0]) {
+      htsp->htsp_language = strdup(lang);
+    } else {
+      free(htsp->htsp_language);
+      htsp->htsp_language = NULL;
+    }
+  }
 
   /* First, just OK the async request */
   htsp_reply(htsp, in, htsmsg_create_map());