Merge pull request #11404 from obrakmann/fix11246_getexternalip-nres

Fix NREs in LobbyUtils.GetExternalIP
This commit is contained in:
Curtis Shmyr
2016-06-12 13:52:18 -06:00
committed by GitHub

View File

@@ -504,8 +504,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public static string GetExternalIP(int clientIndex, OrderManager orderManager)
{
var address = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress;
if (clientIndex == orderManager.LocalClient.Index && address == IPAddress.Loopback.ToString())
var client = orderManager.LobbyInfo.ClientWithIndex(clientIndex);
var address = client != null ? client.IpAddress : "";
var lc = orderManager.LocalClient;
if (lc != null && lc.Index == clientIndex && address == IPAddress.Loopback.ToString())
{
var externalIP = UPnP.GetExternalIP();
if (externalIP != null)