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

Merge pull request #10068 from Mailaender/catch-natdevice-externalip

Browse Source 
Fixed crashes when NatDevice.GetExternalIP() fails
This commit is contained in:
abcdefg30
2015-12-01 17:20:13 +01:00
parent e1dc53a0d2 b75bfec2f8
commit 837c553e88
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -497,9 +497,9 @@ 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() && UPnP.NatDevice != null)
if (clientIndex == orderManager.LocalClient.Index && address == IPAddress.Loopback.ToString())
{
var externalIP = UPnP.NatDevice.GetExternalIP();
var externalIP = UPnP.GetExternalIP();
if (externalIP != null)
address = externalIP.ToString();
}