epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11404 from obrakmann/fix11246_getexternalip-nres

Browse Source 
Fix NREs in LobbyUtils.GetExternalIP
This commit is contained in:
Curtis Shmyr
2016-06-12 13:52:18 -06:00
committed by GitHub
parent d97d02b97f c0dd7c3182
commit 348d49cd5b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
View File

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