From 9a1d3584c22013860ec4b664858076ab6ddf3ea1 Mon Sep 17 00:00:00 2001
From: Loïc Blot <nerzhul@users.noreply.github.com>
Date: Wed, 13 Jun 2018 21:58:34 +0200
Subject: Server: move shutdown parts to a specific shutdown state object
 (#7437)

* Server: move shutdown parts to a specific shutdown state object
---
 src/game.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/game.cpp')

diff --git a/src/game.cpp b/src/game.cpp
index 0da8e1661..6e2583412 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1065,7 +1065,7 @@ void Game::run()
 
 	while (RenderingEngine::run()
 			&& !(*kill || g_gamecallback->shutdown_requested
-			|| (server && server->getShutdownRequested()))) {
+			|| (server && server->isShutdownRequested()))) {
 
 		const irr::core::dimension2d<u32> &current_screen_size =
 			RenderingEngine::get_video_driver()->getScreenSize();
@@ -1271,6 +1271,7 @@ bool Game::createSingleplayerServer(const std::string &map_dir,
 	}
 
 	server = new Server(map_dir, gamespec, simple_singleplayer_mode, bind_addr, false);
+	server->init();
 	server->start();
 
 	return true;
-- 
cgit v1.2.3