Merge branch 'v3.6.2' of github.com:cocos-creator/engine into v3.6.1-sync

This commit is contained in:
santy-wang
2022-10-11 20:12:14 +08:00
486 changed files with 6784 additions and 4333 deletions
+11 -6
View File
@@ -94,11 +94,13 @@ void schedule_task_into_server_thread_task_queue(uv_async_t *async, std::functio
namespace cc {
namespace network {
#define RUN_IN_GAMETHREAD(task) \
do { \
CC_CURRENT_ENGINE()->getScheduler()->performFunctionInCocosThread([=]() { \
task; \
}); \
#define RUN_IN_GAMETHREAD(task) \
do { \
if (CC_CURRENT_APPLICATION()) { \
CC_CURRENT_ENGINE()->getScheduler()->performFunctionInCocosThread([=]() { \
task; \
}); \
} \
} while (0)
#define DISPATCH_CALLBACK_IN_GAMETHREAD() \
@@ -386,7 +388,10 @@ WebSocketServerConnection::~WebSocketServerConnection() {
bool WebSocketServerConnection::send(std::shared_ptr<DataFrame> data) {
_sendQueue.emplace_back(data);
onDrainMessage();
if (!_wsi || _closed || _readyState == ReadyState::CLOSING) {
return false;
}
lws_callback_on_writable(_wsi);
return true;
}