Fixed a deadlock in WorldStorage
git-svn-id: http://mc-server.googlecode.com/svn/trunk@265 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
parent
01341e2788
commit
5958478c59
@ -78,9 +78,11 @@ void cWorldStorage::WaitForFinish(void)
|
||||
{
|
||||
LOG("Waiting for the world storage to finish saving");
|
||||
|
||||
// Cancel all loading requests:
|
||||
cCSLock Lock(m_CSLoadQueue);
|
||||
m_LoadQueue.clear();
|
||||
{
|
||||
// Cancel all loading requests:
|
||||
cCSLock Lock(m_CSLoadQueue);
|
||||
m_LoadQueue.clear();
|
||||
}
|
||||
|
||||
// Wait for the thread to finish:
|
||||
mShouldTerminate = true;
|
||||
|
Loading…
Reference in New Issue
Block a user