From d8861da5990315c415cd250c9d2a8a4f2b9d122b Mon Sep 17 00:00:00 2001
From: LogicParrot <LogicParrot@users.noreply.github.com>
Date: Thu, 4 Feb 2016 16:06:37 +0200
Subject: Prevent server from starting if there's bad world linkage

---
 src/Root.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/Root.cpp')

diff --git a/src/Root.cpp b/src/Root.cpp
index 737d350ff..e022de588 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -327,6 +327,17 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo)
 
 
 
+void cRoot::StopServer()
+{
+	m_TerminateEventRaised = true;
+	m_StopEvent.Set();
+	m_InputThreadRunFlag.clear();
+}
+
+
+
+
+
 void cRoot::LoadGlobalSettings()
 {
 	// Nothing needed yet
@@ -597,9 +608,7 @@ void cRoot::ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallback
 	// Some commands are built-in:
 	if (a_Cmd == "stop")
 	{
-		m_TerminateEventRaised = true;
-		m_StopEvent.Set();
-		m_InputThreadRunFlag.clear();
+		StopServer();
 		return;
 	}
 	else if (a_Cmd == "restart")
-- 
cgit v1.2.3