Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that socket reference is removed on closing WorldSession server sided before ReactorRunnable does in the reactor event loop.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-05-05 22:56:02 +02:00
parent d6f7547eba
commit 6ad4d4c8d2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/WorldSession.cpp
View File

@@ -275,10 +275,14 @@ bool WorldSession::Update(uint32 /*diff*/)
delete packet;
}
///- If necessary, kick the player from the character select screen
if (IsConnectionIdle())
m_Socket->CloseSocket();
///- Cleanup socket pointer if need
if (m_Socket && m_Socket->IsClosed ())
if (m_Socket && m_Socket->IsClosed())
{
m_Socket->RemoveReference ();
m_Socket->RemoveReference();
m_Socket = NULL;
}
@@ -287,10 +291,6 @@ bool WorldSession::Update(uint32 /*diff*/)
if (!m_Socket || (ShouldLogOut(currTime) && !m_playerLoading))
LogoutPlayer(true);
///- If necessary, kick the player from the character select screen
if (IsConnectionIdle())
return false;
if (!m_Socket)
return false; //Will remove this session from the world session map