NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gameserver - Fixed minor merging isues

This commit is contained in:
Dennis Andersen 2014-02-04 16:27:18 +01:00
parent b17b542ebc
commit 168539da08
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Code/Misc/ThreadSafeQueue.h
View File

@ -34,6 +34,8 @@ namespace Utility
virtual bool IsEmpty(); virtual bool IsEmpty();
virtual void Swap( IQueue<Type> &queue ); virtual void Swap( IQueue<Type> &queue );
virtual void Clear();
private: private:
class Node class Node
{ {
@ -216,6 +218,15 @@ namespace Utility
stdMutex.unlock(); stdMutex.unlock();
} }
template < typename Type >
void ThreadSafeQueue<Type>::Clear()
{
while (!IsEmpty())
{
Pop();
}
}
} }
} }

6
Code/Network/NetworkAPI/NetworkClient.cpp
View File

@ -62,9 +62,10 @@ struct NetworkClient::PrivateData : public IThreadObject
} }
~PrivateData() ~PrivateData()
{ {
this->thread.Terminate();
ShutdownWinSock(); ShutdownWinSock();
this->connection.Disconnect(); this->connection.Disconnect();
this->thread.Terminate();
this->owner = 0; this->owner = 0;
this->parent = 0; this->parent = 0;
} }
@ -296,8 +297,11 @@ void NetworkClient::Disconnect()
{ {
if(!privateData) return; if(!privateData) return;
this->privateData->sendQueue.Clear();
privateData->connection.Disconnect(); privateData->connection.Disconnect();
privateData->thread.Terminate(); privateData->thread.Terminate();
} }
void NetworkClient::Send(CustomProtocolObject& protocol) void NetworkClient::Send(CustomProtocolObject& protocol)