summaryrefslogtreecommitdiffstats
path: root/source/cSocketThreads.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-03-10 18:37:00 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-03-10 18:37:00 +0100
commit1a5ebb44aa4ed3aecc84a8d6f0422d504db1ec44 (patch)
treed56236f57100b68f5a1f22afbca1d477af4aadf2 /source/cSocketThreads.cpp
parentWas using "#else if" which is not valid apparently, now using "#elif" (diff)
downloadcuberite-1a5ebb44aa4ed3aecc84a8d6f0422d504db1ec44.tar
cuberite-1a5ebb44aa4ed3aecc84a8d6f0422d504db1ec44.tar.gz
cuberite-1a5ebb44aa4ed3aecc84a8d6f0422d504db1ec44.tar.bz2
cuberite-1a5ebb44aa4ed3aecc84a8d6f0422d504db1ec44.tar.lz
cuberite-1a5ebb44aa4ed3aecc84a8d6f0422d504db1ec44.tar.xz
cuberite-1a5ebb44aa4ed3aecc84a8d6f0422d504db1ec44.tar.zst
cuberite-1a5ebb44aa4ed3aecc84a8d6f0422d504db1ec44.zip
Diffstat (limited to 'source/cSocketThreads.cpp')
-rw-r--r--source/cSocketThreads.cpp7
1 files changed, 4 insertions, 3 deletions
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;