From d530f9e8a1a0f7cdef8ce978bb5d127c8ed73505 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Wed, 15 Aug 2012 11:55:25 +0100 Subject: [PATCH] Corrected mistake in the general config sending routine in extjs.c --- src/webui/extjs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webui/extjs.c b/src/webui/extjs.c index 4b992951..3bb5fde1 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") ) {