From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 12 Feb 2015 12:17:30 +0000 (+0100)
Subject: main: move the http server registration to the end of the initialization phase
X-Git-Tag: v4.1~325
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=434fc5de6acf40bb64b952044d01756ae110e63f;p=thirdparty%2Ftvheadend.git

main: move the http server registration to the end of the initialization phase
---

diff --git a/src/main.c b/src/main.c
index bb8d5625f..41e9dada0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -854,7 +854,6 @@ main(int argc, char **argv)
 #endif
 
   tcp_server_init();
-  http_server_register();
   webui_init(opt_xspf);
 #if ENABLE_UPNP
   upnp_server_init(opt_bindaddr);
@@ -871,6 +870,7 @@ main(int argc, char **argv)
 
   dbus_server_start();
 
+  http_server_register();
   htsp_register();