ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a crash when removing a currently connected transport 

Both, the TCP transport as well as the WebSocket transport were
crashing on this, but with different bugs.
pull/487/head
Michael Zanetti 2021-12-20 23:27:07 +01:00
parent 28d2f53261
commit 8e9adec8d8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-core/servers/tcpserver.cpp
View File

@ -201,6 +201,10 @@ bool TcpServer::stopServer()
if (!m_server) if (!m_server)
return true; return true;
foreach (QTcpSocket *client, m_clientList) {
client->abort();
}
m_server->close(); m_server->close();
m_server->deleteLater(); m_server->deleteLater();
m_server = nullptr; m_server = nullptr;

2
libnymea-core/servers/websocketserver.cpp
View File

@ -239,7 +239,7 @@ bool WebSocketServer::stopServer()
if (m_server) { if (m_server) {
m_server->close(); m_server->close();
delete m_server; m_server->deleteLater();
m_server = nullptr; m_server = nullptr;
} }
return true; return true;