summaryrefslogtreecommitdiffstats
path: root/src/Root.cpp
diff options
context:
space:
mode:
authorjohnsoch <johnsoch@oregonstate.edu>2017-03-17 13:44:28 +0100
committerMattes D <github@xoft.cz>2017-03-17 13:44:28 +0100
commitf269565e73a8c0cbdec35bbaaebefcd580a6cd18 (patch)
tree674a9781715467824cd32d59d627710bf13a8407 /src/Root.cpp
parentMerge pull request #3625 from Seadragon91/patch-1 (diff)
downloadcuberite-f269565e73a8c0cbdec35bbaaebefcd580a6cd18.tar
cuberite-f269565e73a8c0cbdec35bbaaebefcd580a6cd18.tar.gz
cuberite-f269565e73a8c0cbdec35bbaaebefcd580a6cd18.tar.bz2
cuberite-f269565e73a8c0cbdec35bbaaebefcd580a6cd18.tar.lz
cuberite-f269565e73a8c0cbdec35bbaaebefcd580a6cd18.tar.xz
cuberite-f269565e73a8c0cbdec35bbaaebefcd580a6cd18.tar.zst
cuberite-f269565e73a8c0cbdec35bbaaebefcd580a6cd18.zip
Diffstat (limited to '')
-rw-r--r--src/Root.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/Root.cpp b/src/Root.cpp
index 30644a741..0fb2777d5 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -247,6 +247,13 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo)
LOG("Shutting down server...");
m_Server->Shutdown();
} // if (m_Server->Start()
+ else
+ {
+ cRoot::m_TerminateEventRaised = true;
+ #ifdef _WIN32
+ EnableMenuItem(ConsoleMenu, SC_CLOSE, MF_ENABLED); // Re-enable close button
+ #endif
+ }
delete m_MojangAPI; m_MojangAPI = nullptr;