diff options
Diffstat (limited to 'src/server/worldserver/CommandLine')
| -rw-r--r-- | src/server/worldserver/CommandLine/CliRunnable.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index 2d858c415d4..ef1c12f9b67 100644 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -136,10 +136,7 @@ void CliThread() #if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS if (!ReadWinConsole(command)) - { - PrintCliPrefix(); continue; - } #else char* command_str = readline(CLI_PREFIX); ::rl_bind_key('\t', ::rl_complete); @@ -152,18 +149,13 @@ void CliThread() if (!command.empty()) { - std::size_t nextLineIndex = command.find_first_of("\r\n"); - if (nextLineIndex != std::string::npos) + Optional<std::size_t> nextLineIndex = RemoveCRLF(command); + if (nextLineIndex && *nextLineIndex == 0) { - if (nextLineIndex == 0) - { #if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS - PrintCliPrefix(); + PrintCliPrefix(); #endif - continue; - } - - command.erase(nextLineIndex); + continue; } fflush(stdout); |