diff options
Diffstat (limited to 'src/server.cpp')
-rw-r--r-- | src/server.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server.cpp b/src/server.cpp index 05075a72c..b7287c91f 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -904,6 +904,9 @@ Server::~Server() */ stop(); + //shutdown all emerge threads first! + delete m_emerge; + /* Delete clients */ @@ -923,7 +926,6 @@ Server::~Server() // Delete things in the reverse order of creation delete m_env; delete m_rollback; - delete m_emerge; delete m_event; delete m_itemdef; delete m_nodedef; |