From 1a5ebb44aa4ed3aecc84a8d6f0422d504db1ec44 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 10 Mar 2012 17:37:00 +0000 Subject: Fixed *nix threading issue; Thread objects now use variable names consistent with MCS convention; Fixed a few *nix threading cornercases git-svn-id: http://mc-server.googlecode.com/svn/trunk@392 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cSocketThreads.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/cSocketThreads.cpp') diff --git a/source/cSocketThreads.cpp b/source/cSocketThreads.cpp index 74324f909..1aa802a23 100644 --- a/source/cSocketThreads.cpp +++ b/source/cSocketThreads.cpp @@ -155,7 +155,8 @@ void cSocketThreads::Write(const cSocket * a_Socket, const AString & a_Data) } } // for itr - m_Threads[] - ASSERT(!"Writing to an unknown socket"); + // This may be perfectly legal, if the socket has been destroyed and the client is finishing up + // ASSERT(!"Writing to an unknown socket"); } @@ -224,7 +225,7 @@ cSocketThreads::cSocketThread::cSocketThread(cSocketThreads * a_Parent) : cSocketThreads::cSocketThread::~cSocketThread() { - mShouldTerminate = true; + m_ShouldTerminate = true; m_ControlSocket1.CloseSocket(); m_ControlSocket2.CloseSocket(); } @@ -506,7 +507,7 @@ void cSocketThreads::cSocketThread::Execute(void) } // The main thread loop: - while (!mShouldTerminate) + while (!m_ShouldTerminate) { // Put all sockets into the Read set: fd_set fdRead; -- cgit v1.2.3