diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-09-02 20:03:42 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-09-02 20:03:42 +0200 |
| commit | d3b8100a7b84a465ca52238d459bb10d32940c46 (patch) | |
| tree | 2c272ec985b9228ef2e4892aeeabefa54786d215 /src/Root.cpp | |
| parent | Removed SexyMotd link (diff) | |
| parent | Re-added alternate spellings of darkgraywool. (diff) | |
| download | cuberite-d3b8100a7b84a465ca52238d459bb10d32940c46.tar cuberite-d3b8100a7b84a465ca52238d459bb10d32940c46.tar.gz cuberite-d3b8100a7b84a465ca52238d459bb10d32940c46.tar.bz2 cuberite-d3b8100a7b84a465ca52238d459bb10d32940c46.tar.lz cuberite-d3b8100a7b84a465ca52238d459bb10d32940c46.tar.xz cuberite-d3b8100a7b84a465ca52238d459bb10d32940c46.tar.zst cuberite-d3b8100a7b84a465ca52238d459bb10d32940c46.zip | |
Diffstat (limited to 'src/Root.cpp')
| -rw-r--r-- | src/Root.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/Root.cpp b/src/Root.cpp index ef66f9870..f04cbf08b 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -468,16 +468,6 @@ void cRoot::QueueExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCall void cRoot::QueueExecuteConsoleCommand(const AString & a_Cmd) { - // Some commands are built-in: - if (a_Cmd == "stop") - { - m_bStop = true; - } - else if (a_Cmd == "restart") - { - m_bRestart = true; - } - // Put the command into a queue (Alleviates FS #363): cCSLock Lock(m_CSPendingCommands); m_PendingCommands.push_back(cCommand(a_Cmd, new cLogCommandDeleteSelfOutputCallback)); @@ -489,14 +479,16 @@ void cRoot::QueueExecuteConsoleCommand(const AString & a_Cmd) void cRoot::ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallback & a_Output) { - // Some commands are built-in: + // cRoot handles stopping and restarting due to our access to controlling variables if (a_Cmd == "stop") { m_bStop = true; + return; } else if (a_Cmd == "restart") { m_bRestart = true; + return; } LOG("Executing console command: \"%s\"", a_Cmd.c_str()); |