(svn r22369) -Codechange: allocate ClientInfo when needed, i.e. don't allocate it for clients that are there to just get a list of companies. This means that these short lived clients won't be seen by the admin network in their client queries anymore

1 files changed, 4 insertions, 1 deletions

diff --git a/src/network/network_admin.cpp b/src/network/network_admin.cpp
index a5726093c..3bda0ae84 100644
--- a/src/network/network_admin.cpp
+++ b/src/network/network_admin.cpp
@@ -208,9 +208,12 @@ NetworkRecvStatus ServerNetworkAdminSocketHandler::SendClientJoin(ClientID clien
 
 NetworkRecvStatus ServerNetworkAdminSocketHandler::SendClientInfo(const NetworkClientSocket *cs)
 {
+	/* Only send data when we're a proper client, not just someone trying to query the server. */
+	const NetworkClientInfo *ci = cs->GetInfo();
+	if (ci == NULL) return NETWORK_RECV_STATUS_OKAY;
+
 	Packet *p = new Packet(ADMIN_PACKET_SERVER_CLIENT_INFO);
 
-	const NetworkClientInfo *ci = cs->GetInfo();
 	p->Send_uint32(ci->client_id);
 	p->Send_string(const_cast<NetworkAddress &>(cs->client_address).GetHostname());
 	p->Send_string(ci->client_name);