]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Corrected mistake in the general config sending routine in extjs.c 113/head
authorAdam Sutton <dev@adamsutton.me.uk>
Wed, 15 Aug 2012 10:55:25 +0000 (11:55 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Wed, 15 Aug 2012 10:55:25 +0000 (11:55 +0100)
src/webui/extjs.c

index 4b992951edd82db02a1ffa96b46aca4ddfa42d56..3bb5fde10d12df6bfcbd0c4376d7e5d185cdca77 100644 (file)
@@ -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") ) {