oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

Fix use of previously deallocated EmergeManager

Browse source
This commit is contained in:
kwolekr 2014-01-26 01:12:18 -05:00
parent 6e352e3cbf
commit 9b978db0c2
3 changed files with 46 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/server.cpp
View file

@ -917,8 +917,9 @@ Server::~Server()
stop();
delete m_thread;
//shutdown all emerge threads first!
delete m_emerge;
// stop all emerge threads before deleting players that may have
// requested blocks to be emerged
m_emerge->stopThreads();
/*
Delete clients
@ -938,6 +939,10 @@ Server::~Server()
// Delete things in the reverse order of creation
delete m_env;
// N.B. the EmergeManager should be deleted after the Environment since Map
// depends on EmergeManager to write its current params to the map meta
delete m_emerge;
delete m_rollback;
delete m_banmanager;
delete m_event;
@ -1684,7 +1689,7 @@ void Server::AsyncRunStep(bool initial_step)
{
counter = 0.0;
m_emerge->startAllThreads();
m_emerge->startThreads();
// Update m_enable_rollback_recording here too
m_enable_rollback_recording =