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

Ensure we never return a null string from LookupCountry.

Browse Source
This commit is contained in:
RoosterDragon
2015-04-28 20:51:41 +01:00
parent ccf9d8fe97
commit 748b37ede7
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

@@ -237,14 +237,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public static string LookupCountry(string ip) public static string LookupCountry(string ip)
{ {
const string Unknown = "Unknown Location";
try try
{ {
return Game.GeoIpDatabase.Country(ip).Country.Name; return Game.GeoIpDatabase.Country(ip).Country.Name ?? Unknown;
} }
catch (Exception e) catch (Exception e)
{ {
Log.Write("geoip", "LookupCountry failed: {0}", e); Log.Write("geoip", "LookupCountry failed: {0}", e);
return "Unknown Location"; return Unknown;
} }
} }