From 2b4d37de3dfc1500288190d360fd64a5ca9b7f6e Mon Sep 17 00:00:00 2001
From: smatz <smatz@openttd.org>
Date: Tue, 2 Jun 2009 19:56:23 +0000
Subject: [PATCH] (svn r16506) -Fix: count only active clients (not those
 waiting for map download) when checking min_active_clients limit

---
 src/network/network.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/network/network.cpp b/src/network/network.cpp
index 32b1cb6834..90f048b2cd 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -334,14 +334,20 @@ StringID GetNetworkErrorMsg(NetworkErrorCode err)
 	return network_error_strings[err];
 }
 
-/* Count the number of active clients connected */
+/**
+ * Counts the number of active clients connected.
+ * It has to be in STATUS_ACTIVE and not a spectator
+ * @return number of active clients
+ */
 static uint NetworkCountActiveClients()
 {
-	const NetworkClientInfo *ci;
+	const NetworkClientSocket *cs;
 	uint count = 0;
 
-	FOR_ALL_CLIENT_INFOS(ci) {
-		if (Company::IsValidID(ci->client_playas)) count++;
+	FOR_ALL_CLIENT_SOCKETS(cs) {
+		if (cs->status != STATUS_ACTIVE) continue;
+		if (!Company::IsValidID(cs->GetInfo()->client_playas)) continue;
+		count++;
 	}
 
 	return count;