From e4100fc3bd2b85a1f62f42e062dd19b336d20ad8 Mon Sep 17 00:00:00 2001 From: Gunter Labes Date: Sun, 3 Jun 2018 16:44:44 +0200 Subject: [PATCH] check for empty parameters before looping over all players (cherry-picked from commit 0362e36305eda584d16fb89de40f9314278316e0) --- src/server/server.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/server/server.cpp b/src/server/server.cpp index 9e8817fa869d..3a7e07b7f18c 100644 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -2288,21 +2288,20 @@ void server::version_handler( const std::string& /*issuer_name*/, const std::string& /*query*/, std::string& parameters, std::ostringstream* out) { assert(out != nullptr); - - + + if(parameters.empty()) { + *out << "Server version is " << game_config::version; + return; + } + for(const auto& player : player_connections_) { if(parameters == player.info().name()) { *out << "Player " << parameters << " is using wesnoth " << player.info().version(); return; } } - if(parameters.empty()) { - *out << "Server version is " << game_config::version; - - } - else { - *out << "Player " << parameters << " not found."; - } + + *out << "Player '" << parameters << "' not found."; } void server::status_handler(