diff options
| -rw-r--r-- | src/emerge.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp index 8d8186126..e81793ff8 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -580,6 +580,23 @@ void *EmergeThread::Thread() m_server->setAsyncFatalError(err.str()); } + { + JMutexAutoLock queuelock(emerge->queuemutex); + while (!blockqueue.empty()) + { + v3s16 p = blockqueue.front(); + blockqueue.pop(); + + std::map<v3s16, BlockEmergeData *>::iterator iter; + iter = emerge->blocks_enqueued.find(p); + if (iter == emerge->blocks_enqueued.end()) + continue; //uh oh, queue and map out of sync!! + + BlockEmergeData *bedata = iter->second; + delete bedata; + } + } + END_DEBUG_EXCEPTION_HANDLER(errorstream) log_deregister_thread(); return NULL; |