diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-09-02 20:11:38 +0200 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-09-02 20:11:38 +0200 |
commit | e431bb4e63b03a4137e4264beccfab0fffea6e36 (patch) | |
tree | e5442606b9e5be82070dc733b6162a76ed89ac87 /src/Root.cpp | |
parent | Changed the IsEnchantable() comment. (diff) | |
parent | Re-added alternate spellings of darkgraywool. (diff) | |
download | cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.tar cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.tar.gz cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.tar.bz2 cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.tar.lz cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.tar.xz cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.tar.zst cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.zip |
Diffstat (limited to '')
-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()); |