diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-10 18:37:00 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-10 18:37:00 +0100 |
| commit | 1a5ebb44aa4ed3aecc84a8d6f0422d504db1ec44 (patch) | |
| tree | d56236f57100b68f5a1f22afbca1d477af4aadf2 /source/WorldStorage.cpp | |
| parent | Was using "#else if" which is not valid apparently, now using "#elif" (diff) | |
| download | cuberite-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/WorldStorage.cpp')
| -rw-r--r-- | source/WorldStorage.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/WorldStorage.cpp b/source/WorldStorage.cpp index 484b87691..791d640c4 100644 --- a/source/WorldStorage.cpp +++ b/source/WorldStorage.cpp @@ -153,10 +153,11 @@ void cWorldStorage::WaitForFinish(void) }
// Wait for the thread to finish:
- mShouldTerminate = true;
+ m_ShouldTerminate = true;
m_Event.Set();
m_evtRemoved.Set(); // Wake up anybody waiting in the WaitForQueuesEmpty() method
super::Wait();
+ LOG("World storage thread finished");
}
@@ -166,7 +167,7 @@ void cWorldStorage::WaitForFinish(void) void cWorldStorage::WaitForQueuesEmpty(void)
{
cCSLock Lock(m_CSQueues);
- while (!mShouldTerminate && (!m_LoadQueue.empty() || !m_SaveQueue.empty()))
+ while (!m_ShouldTerminate && (!m_LoadQueue.empty() || !m_SaveQueue.empty()))
{
cCSUnlock Unlock(Lock);
m_evtRemoved.Wait();
@@ -305,7 +306,7 @@ void cWorldStorage::InitSchemas(void) void cWorldStorage::Execute(void)
{
- while (!mShouldTerminate)
+ while (!m_ShouldTerminate)
{
m_Event.Wait();
@@ -314,7 +315,7 @@ void cWorldStorage::Execute(void) do
{
HasMore = false;
- if (mShouldTerminate)
+ if (m_ShouldTerminate)
{
return;
}
|