aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2020-07-28 19:44:38 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-24 13:15:13 +0100
commitd2cde75ab2a3b669ae23fde2338527684626f403 (patch)
tree73c78cbd5cbf8014cb7e3e9938e8a3a9f3196245 /src/server/game/Server
parentf220e46c50301b1d77d321bf6eed5093370a2fef (diff)
Core/Networking: Fixed authserver socket read handlers being called on incorrect thread
(cherry picked from commit 3ad05386c844438af0dda56bbb46fa665d870c5c)
Diffstat (limited to 'src/server/game/Server')
-rw-r--r--src/server/game/Server/WorldSocketMgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index bf3f5c9a315..75299c6f3ce 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -92,13 +92,13 @@ bool WorldSocketMgr::StartWorldNetwork(Trinity::Asio::IoContext& ioContext, std:
if (!instanceAcceptor->Bind())
{
TC_LOG_ERROR("network", "StartNetwork failed to bind instance socket acceptor");
+ delete instanceAcceptor;
return false;
}
_instanceAcceptor = instanceAcceptor;
- _acceptor->SetSocketFactory(std::bind(&BaseSocketMgr::GetSocketForAccept, this));
- _instanceAcceptor->SetSocketFactory(std::bind(&BaseSocketMgr::GetSocketForAccept, this));
+ _instanceAcceptor->SetSocketFactory([this]() { return GetSocketForAccept(); });
_acceptor->AsyncAcceptWithCallback<&OnSocketAccept>();
_instanceAcceptor->AsyncAcceptWithCallback<&OnSocketAccept>();