summaryrefslogtreecommitdiffstats
path: root/src/OSSupport
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2013-12-20 19:50:47 +0100
committerSTRWarrior <niels.breuker@hotmail.nl>2013-12-20 19:50:47 +0100
commit9c575681f88064a57fc1151c1f1f96f4a6b2fdd5 (patch)
treeded712c5732afc72427714ca40a04da87d24386a /src/OSSupport
parentIncreased the range an Floater can shoot to. (diff)
parentFixed the rest of constructor reorders. (diff)
downloadcuberite-9c575681f88064a57fc1151c1f1f96f4a6b2fdd5.tar
cuberite-9c575681f88064a57fc1151c1f1f96f4a6b2fdd5.tar.gz
cuberite-9c575681f88064a57fc1151c1f1f96f4a6b2fdd5.tar.bz2
cuberite-9c575681f88064a57fc1151c1f1f96f4a6b2fdd5.tar.lz
cuberite-9c575681f88064a57fc1151c1f1f96f4a6b2fdd5.tar.xz
cuberite-9c575681f88064a57fc1151c1f1f96f4a6b2fdd5.tar.zst
cuberite-9c575681f88064a57fc1151c1f1f96f4a6b2fdd5.zip
Diffstat (limited to '')
-rw-r--r--src/OSSupport/IsThread.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/OSSupport/IsThread.cpp b/src/OSSupport/IsThread.cpp
index 7eb114a82..36205bcf1 100644
--- a/src/OSSupport/IsThread.cpp
+++ b/src/OSSupport/IsThread.cpp
@@ -51,8 +51,8 @@ static void SetThreadName( DWORD dwThreadID, LPCSTR szThreadName)
// cIsThread:
cIsThread::cIsThread(const AString & iThreadName) :
- m_ThreadName(iThreadName),
m_ShouldTerminate(false),
+ m_ThreadName(iThreadName),
m_Handle(NULL_HANDLE)
{
}
@@ -144,7 +144,7 @@ bool cIsThread::Wait(void)
return (res == WAIT_OBJECT_0);
#else // _WIN32
int res = pthread_join(m_Handle, NULL);
- m_Handle = NULL;
+ m_Handle = NULL_HANDLE;
#ifdef LOGD // ProtoProxy doesn't have LOGD
LOGD("Thread %s finished", m_ThreadName.c_str());