From c19c19d6f5d65a79f8b6d97aa6999120a77a20c5 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Mon, 1 May 2017 15:24:49 +0900
Subject: [PATCH] Fix for condition
---
app/src/main.cpp | 7 ++++---
app/src/websockets/websocketserver.cpp | 3 +++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/src/main.cpp b/app/src/main.cpp
index 076ae3f..acfa5fd 100644
--- a/app/src/main.cpp
+++ b/app/src/main.cpp
@@ -49,12 +49,13 @@ int main(int argc, char *argv[])
// Setup websocket server
WebSocketServer *webSocketServer = new WebSocketServer(appConfigApplication["id"].toString(), port, &app);
- if (!webSocketServer->start()) {
+ if (webSocketServer->start()) {
+ qDebug() << "Websocket server started at:" << webSocketServer->serverUrl().toString();
+ }
+ else {
qCritical() << "Failed to start websocket server:" << webSocketServer->errorString();
return 1;
}
- qDebug() << "Websocket server started at:" <<webSocketServer->serverUrl().toString();
-
return app.exec();
}
diff --git a/app/src/websockets/websocketserver.cpp b/app/src/websockets/websocketserver.cpp
index 3617fa0..b323173 100644
--- a/app/src/websockets/websocketserver.cpp
+++ b/app/src/websockets/websocketserver.cpp
@@ -11,6 +11,9 @@ WebSocketServer::WebSocketServer(const QString &serverName, quint16 serverPort,
WebSocketServer::~WebSocketServer()
{
+ if (webSocketServer_->isListening()) {
+ webSocketServer_->close();
+ }
webSocketServer_->deleteLater();
}
--
GitLab