From 68163f20de5a4ce1ec114d3f5690ca9d1ca2e9e3 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Tue, 27 Dec 2022 20:05:47 +0100
Subject: [PATCH] Properly clean up the TCP server on shutdown

---
 libnymea-core/servers/tcpserver.cpp       | 4 ++--
 libnymea-core/servers/websocketserver.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libnymea-core/servers/tcpserver.cpp b/libnymea-core/servers/tcpserver.cpp
index 2497f88e..1b563844 100644
--- a/libnymea-core/servers/tcpserver.cpp
+++ b/libnymea-core/servers/tcpserver.cpp
@@ -176,7 +176,7 @@ void TcpServer::setServerName(const QString &serverName)
  */
 bool TcpServer::startServer()
 {
-    m_server = new SslServer(configuration().sslEnabled, m_sslConfig);
+    m_server = new SslServer(configuration().sslEnabled, m_sslConfig, this);
     if(!m_server->listen(QHostAddress(configuration().address), static_cast<quint16>(configuration().port))) {
         qCWarning(dcTcpServer()) << "Tcp server error: can not listen on" << configuration().address << configuration().port;
         delete m_server;
@@ -207,7 +207,7 @@ bool TcpServer::stopServer()
     }
 
     m_server->close();
-    m_server->deleteLater();
+    delete m_server;
     m_server = nullptr;
     return true;
 }
diff --git a/libnymea-core/servers/websocketserver.cpp b/libnymea-core/servers/websocketserver.cpp
index 37de1f90..bb0bf062 100644
--- a/libnymea-core/servers/websocketserver.cpp
+++ b/libnymea-core/servers/websocketserver.cpp
@@ -240,7 +240,7 @@ bool WebSocketServer::stopServer()
 
     if (m_server) {
         m_server->close();
-        m_server->deleteLater();
+        delete m_server;
         m_server = nullptr;
     }
     return true;