Merge pull request #7339 from obrakmann/fix7303_wrong_ip_in_lobby_client_tooltip

Fixes #7303
This commit is contained in:
Matthias Mailänder
2015-01-17 10:57:51 +01:00

View File

@@ -76,7 +76,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
latency.GetText = () => LobbyUtils.LatencyDescription(ping); latency.GetText = () => LobbyUtils.LatencyDescription(ping);
latency.GetColor = () => LobbyUtils.LatencyColor(ping); latency.GetColor = () => LobbyUtils.LatencyColor(ping);
var address = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress; var address = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress;
if (address == IPAddress.Loopback.ToString() && UPnP.NatDevice != null) if (clientIndex == orderManager.LocalClient.Index && UPnP.NatDevice != null
&& address == IPAddress.Loopback.ToString())
address = UPnP.NatDevice.GetExternalIP().ToString(); address = UPnP.NatDevice.GetExternalIP().ToString();
var cachedDescriptiveIP = LobbyUtils.DescriptiveIpAddress(address); var cachedDescriptiveIP = LobbyUtils.DescriptiveIpAddress(address);
ip.GetText = () => cachedDescriptiveIP; ip.GetText = () => cachedDescriptiveIP;