From 64453cb134f0d26d48aa237a888fe8b08013a435 Mon Sep 17 00:00:00 2001 From: dP Date: Mon, 12 Sep 2022 11:18:41 +0300 Subject: [PATCH] Fix: Incorrect player name in online players window (#10013) --- src/network/network_gui.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index a819fcc32c..4017c0e71c 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1777,9 +1777,11 @@ public: SetDParam(0, STR_NETWORK_CLIENT_LIST_SERVER_CONNECTION_TYPE_UNKNOWN + _network_server_connection_type); break; - case WID_CL_CLIENT_NAME: - SetDParamStr(0, _settings_client.network.client_name); + case WID_CL_CLIENT_NAME: { + const NetworkClientInfo *own_ci = NetworkClientInfo::GetByClientID(_network_own_client_id); + SetDParamStr(0, own_ci != nullptr ? own_ci->client_name : _settings_client.network.client_name); break; + } case WID_CL_CLIENT_COMPANY_COUNT: SetDParam(0, NetworkClientInfo::GetNumItems()); @@ -1799,12 +1801,13 @@ public: ShowQueryString(STR_JUST_RAW_STRING, STR_NETWORK_CLIENT_LIST_SERVER_NAME_QUERY_CAPTION, NETWORK_NAME_LENGTH, this, CS_ALPHANUMERAL, QSF_LEN_IN_CHARS); break; - case WID_CL_CLIENT_NAME_EDIT: + case WID_CL_CLIENT_NAME_EDIT: { + const NetworkClientInfo *own_ci = NetworkClientInfo::GetByClientID(_network_own_client_id); this->query_widget = WID_CL_CLIENT_NAME_EDIT; - SetDParamStr(0, _settings_client.network.client_name); + SetDParamStr(0, own_ci != nullptr ? own_ci->client_name : _settings_client.network.client_name); ShowQueryString(STR_JUST_RAW_STRING, STR_NETWORK_CLIENT_LIST_PLAYER_NAME_QUERY_CAPTION, NETWORK_CLIENT_NAME_LENGTH, this, CS_ALPHANUMERAL, QSF_LEN_IN_CHARS); break; - + } case WID_CL_SERVER_VISIBILITY: if (!_network_server) break;