Merge PR #487: Fix a crash when removing a currently connected transport
This commit is contained in:
commit
de82c4aa8e
@ -202,6 +202,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;
|
||||||
|
|||||||
@ -240,7 +240,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;
|
||||||
|
|||||||
Reference in New Issue
Block a user