Merge pull request #8398 from Mailaender/ping-order-nre

Fixed NREs in LobbyCommands PingFromClient
2015-06-29 01:55:54 +03:00
parent f65df39e36 e228601a5c
commit 6ed7e46162
2 changed files with 15 additions and 4 deletions
--- a/OpenRA.Game/Server/Server.cs
+++ b/OpenRA.Game/Server/Server.cs
@@ -492,7 +492,11 @@ namespace OpenRA.Server
 							break;
 						}

-						var pingFromClient = LobbyInfo.PingFromClient(GetClient(conn));
+						var client = GetClient(conn);
+						if (client == null)
+							return;
+
+						var pingFromClient = LobbyInfo.PingFromClient(client);
 						if (pingFromClient == null)
 							return;