From: Adam Sutton <dev@adamsutton.me.uk>
Date: Wed, 15 Aug 2012 10:55:25 +0000 (+0100)
Subject: Corrected mistake in the general config sending routine in extjs.c
X-Git-Tag: 3.3~173
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F113%2Fhead;p=thirdparty%2Ftvheadend.git

Corrected mistake in the general config sending routine in extjs.c
---

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 4b992951e..3bb5fde10 100644
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -1726,10 +1726,10 @@ extjs_config(http_connection_t *hc, const char *remain, void *opaque)
   /* Basic settings (not the advanced schedule) */
   if(!strcmp(op, "loadSettings")) {
     pthread_mutex_lock(&global_lock);
-    out = htsmsg_create_map();
-    if ((m   = config_get_all()))
-      htsmsg_add_msg(out, "config", m);
+    m = config_get_all();
     pthread_mutex_unlock(&global_lock);
+    if (!m) return HTTP_STATUS_BAD_REQUEST;
+    out = json_single_record(m, "config");
 
   /* Save settings */
   } else if (!strcmp(op, "saveSettings") ) {