Stop WebServer before JSON API to avoid blocking calls by UI

Author: Lord-Grey

src/hyperiond/hyperiond.cpp

@@ -342,12 +342,6 @@ void HyperionDaemon::stopNetworkServices()
 	}
 #endif
 
-	if (_jsonServerThread->isRunning()) {
-		_jsonServerThread->quit();
-		_jsonServerThread->wait();
-	}
-	_jsonServer.reset(nullptr);
-
 	if (_webServerThread->isRunning()) {
 		_webServerThread->quit();
 		_webServerThread->wait();
@@ -359,6 +353,12 @@ void HyperionDaemon::stopNetworkServices()
 		_sslWebServerThread->wait();
 	}
 
+	if (_jsonServerThread->isRunning()) {
+		_jsonServerThread->quit();
+		_jsonServerThread->wait();
+	}
+	_jsonServer.reset(nullptr);
+
 	QMetaObject::invokeMethod(_ssdpHandler.get(), &SSDPHandler::stop, Qt::QueuedConnection);
 	if (_ssdpHandlerThread->isRunning()) {
 		_ssdpHandlerThread->quit();