From 1d13ac7280ae56bee361fb0c19232dac66bf46ff Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sat, 11 May 2024 21:39:14 +0200 Subject: [PATCH] Fix #12655, 4f6d75f: inconsistent state in client list and potential crash after client leaves (cherry picked from commit f939e81bf0aef5bdb1cf825536418f17e81b85a3) --- src/network/network_server.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 5007646793..3e01b03b84 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -215,6 +215,8 @@ ServerNetworkGameSocketHandler::~ServerNetworkGameSocketHandler() this->savegame->Destroy(); this->savegame = nullptr; } + + InvalidateWindowData(WC_CLIENT_LIST, 0); } bool ServerNetworkGameSocketHandler::ParseKeyPasswordPacket(Packet &p, NetworkSharedSecrets &ss, const std::string &password, std::string *payload, size_t length) @@ -336,8 +338,6 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::CloseConnection(NetworkRecvSta this->DeferDeletion(); - InvalidateWindowData(WC_CLIENT_LIST, 0); - return status; }