From f939e81bf0aef5bdb1cf825536418f17e81b85a3 Mon Sep 17 00:00:00 2001
From: Rubidium <rubidium@openttd.org>
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

---
 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 099479c158..0db16a5660 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -216,6 +216,8 @@ ServerNetworkGameSocketHandler::~ServerNetworkGameSocketHandler()
 		this->savegame->Destroy();
 		this->savegame = nullptr;
 	}
+
+	InvalidateWindowData(WC_CLIENT_LIST, 0);
 }
 
 std::unique_ptr<Packet> ServerNetworkGameSocketHandler::ReceivePacket()
@@ -279,8 +281,6 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::CloseConnection(NetworkRecvSta
 
 	this->DeferDeletion();
 
-	InvalidateWindowData(WC_CLIENT_LIST, 0);
-
 	return status;
 }