fix crash on close

This commit is contained in:
Dimon4eg
2019-05-10 20:32:17 +03:00
parent dfaaaca223
commit 1778874ea8
2 changed files with 6 additions and 12 deletions

View File

@ -144,18 +144,16 @@ namespace ix
// This value needs to be forced when shutting down, it is restored later
_automaticReconnection = false;
// sync close
close();
if (!_thread.joinable())
if (_thread.joinable())
{
_automaticReconnection = automaticReconnection;
return;
_stop = true;
_thread.join();
_stop = false;
}
_stop = true;
_thread.join();
_stop = false;
_automaticReconnection = automaticReconnection;
}
@ -289,10 +287,8 @@ namespace ix
{
setThreadName(getUrl());
while (true)
while (getReadyState() != WebSocket_ReadyState_Closed)
{
if (_stop && !isClosing()) return;
// 1. Make sure we are always connected
reconnectPerpetuallyIfDisconnected();