summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-01-04 13:03:41 +0100
committerTycho <work.tycho+git@gmail.com>2014-01-04 13:03:41 +0100
commitf0b35930281ba292adaeddfe95dc833533dfc874 (patch)
tree0aab046a47fa9d39f09561744fff8bbfbbc27230 /src/World.cpp
parentremoved tolua++ makefile which is overwritten by cmake (diff)
parentMerge pull request #494 from worktycho/threadsafequeue (diff)
downloadcuberite-f0b35930281ba292adaeddfe95dc833533dfc874.tar
cuberite-f0b35930281ba292adaeddfe95dc833533dfc874.tar.gz
cuberite-f0b35930281ba292adaeddfe95dc833533dfc874.tar.bz2
cuberite-f0b35930281ba292adaeddfe95dc833533dfc874.tar.lz
cuberite-f0b35930281ba292adaeddfe95dc833533dfc874.tar.xz
cuberite-f0b35930281ba292adaeddfe95dc833533dfc874.tar.zst
cuberite-f0b35930281ba292adaeddfe95dc833533dfc874.zip
Diffstat (limited to '')
-rw-r--r--src/World.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/World.cpp b/src/World.cpp
index cc543d460..39300d419 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -367,10 +367,13 @@ void cWorld::InitializeSpawn(void)
cWorldLoadProgress Progress(this);
// Wait for the loader to finish loading
- m_Storage.WaitForQueuesEmpty();
+ m_Storage.WaitForLoadQueueEmpty();
// Wait for the generator to finish generating
m_Generator.WaitForQueueEmpty();
+
+ // Wait for the loader to finish saving
+ m_Storage.WaitForSaveQueueEmpty();
Progress.Stop();
}