Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Websocket bug fix after PR#17440 was merged. (#17450) 

* Websocket bug fix after PR#17440 was merged.

* typo fix
This commit is contained in:
James Chen 2017-03-07 09:35:14 +08:00 committed by minggo
parent b32c84f8c2
commit ce2f4e892f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cocos/network/WebSocket.cpp
View File

@ -616,14 +616,11 @@ bool WebSocket::init(const Delegate& delegate,
} }
} }
// WebSocket thread needs to be invoked at the end of this method. bool isWebSocketThreadCreated = true;
if (__wsHelper == nullptr) if (__wsHelper == nullptr)
{ {
__wsHelper = new (std::nothrow) WsThreadHelper(); __wsHelper = new (std::nothrow) WsThreadHelper();
// https://github.com/cocos2d/cocos2d-x/issues/17433 isWebSocketThreadCreated = false;
// lws_service(__wsContext, 2);
// this function called must be after ws->onClientOpenConnectionRequest or crash
// __wsHelper->createWebSocketThread();
} }
WsMessage* msg = new (std::nothrow) WsMessage(); WsMessage* msg = new (std::nothrow) WsMessage();
@ -631,7 +628,13 @@ bool WebSocket::init(const Delegate& delegate,
msg->user = this; msg->user = this;
__wsHelper->sendMessageToWebSocketThread(msg); __wsHelper->sendMessageToWebSocketThread(msg);
__wsHelper->createWebSocketThread(); // fixed https://github.com/cocos2d/cocos2d-x/issues/17433
// createWebSocketThread has to be after message WS_MSG_TO_SUBTHREAD_CREATE_CONNECTION was sent.
// And websocket thread should only be created once.
if (!isWebSocketThreadCreated)
{
__wsHelper->createWebSocketThread();
}
return true; return true;
} }