From: Loïc Blot <loic.blot@unix-experience.fr>
Date: Mon, 25 Mar 2019 15:54:27 +0000 (+0100)
Subject: Create ServerThread earlier in the startup process
X-Git-Tag: 5.1.0~256
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=64bdd4b5095a6cd0a55ffe4d842a91d5086d0e04;p=oweals%2Fminetest.git

Create ServerThread earlier in the startup process
---

diff --git a/src/server.cpp b/src/server.cpp
index 172bb4744..869498965 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -220,6 +220,7 @@ Server::Server(
 	m_itemdef(createItemDefManager()),
 	m_nodedef(createNodeDefManager()),
 	m_craftdef(createCraftDefManager()),
+	m_thread(new ServerThread(this)),
 	m_uptime(0),
 	m_clients(m_con),
 	m_admin_chat(iface),
@@ -321,9 +322,6 @@ void Server::init()
 	if (!loadGameConfAndInitWorld(m_path_world, m_gamespec))
 		throw ServerError("Failed to initialize world");
 
-	// Create server thread
-	m_thread = new ServerThread(this);
-
 	// Create emerge manager
 	m_emerge = new EmergeManager(this);