summaryrefslogtreecommitdiffstats
path: root/src/Root.cpp
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-20 00:44:19 +0200
committerarchshift <admin@archshift.com>2014-07-20 00:44:19 +0200
commit14826b660649c87c002b4ba23a255007f141dab4 (patch)
treed4a1de7b55cfca5d80f9b0c8fce0e34192d0d9b3 /src/Root.cpp
parentSocket: removed unused Socket destructor (diff)
downloadcuberite-14826b660649c87c002b4ba23a255007f141dab4.tar
cuberite-14826b660649c87c002b4ba23a255007f141dab4.tar.gz
cuberite-14826b660649c87c002b4ba23a255007f141dab4.tar.bz2
cuberite-14826b660649c87c002b4ba23a255007f141dab4.tar.lz
cuberite-14826b660649c87c002b4ba23a255007f141dab4.tar.xz
cuberite-14826b660649c87c002b4ba23a255007f141dab4.tar.zst
cuberite-14826b660649c87c002b4ba23a255007f141dab4.zip
Diffstat (limited to 'src/Root.cpp')
-rw-r--r--src/Root.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Root.cpp b/src/Root.cpp
index d727e34a3..ba25b97eb 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -77,7 +77,7 @@ void cRoot::InputThread(void * a_Params)
cLogCommandOutputCallback Output;
- while (!self.m_bStop && !self.m_bRestart && !g_TERMINATE_EVENT_RAISED && std::cin.good())
+ while (!self.m_bStop && !self.m_bRestart && !m_TerminateEventRaised && std::cin.good())
{
AString Command;
std::getline(std::cin, Command);
@@ -87,7 +87,7 @@ void cRoot::InputThread(void * a_Params)
}
}
- if (g_TERMINATE_EVENT_RAISED || !std::cin.good())
+ if (m_TerminateEventRaised || !std::cin.good())
{
// We have come here because the std::cin has received an EOF / a terminate signal has been sent, and the server is still running; stop the server:
self.m_bStop = true;
@@ -203,12 +203,12 @@ void cRoot::Start(void)
EnableMenuItem(hmenu, SC_CLOSE, MF_ENABLED); // Re-enable close button
#endif
- while (!m_bStop && !m_bRestart && !g_TERMINATE_EVENT_RAISED) // These are modified by external threads
+ while (!m_bStop && !m_bRestart && !m_TerminateEventRaised) // These are modified by external threads
{
cSleep::MilliSleep(1000);
}
- if (g_TERMINATE_EVENT_RAISED)
+ if (m_TerminateEventRaised)
{
m_bStop = true;
}