Merge pull request #8057 from RoosterDragon/location-fix

Safer country lookup
2015-04-29 23:57:20 +03:00
parent bf0ee862b2 748b37ede7
commit 2d5517fc23
1 changed files with 4 additions and 2 deletions
--- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
@@ -237,14 +237,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic

 		public static string LookupCountry(string ip)
 		{
+			const string Unknown = "Unknown Location";
+
 			try
 			{
-				return Game.GeoIpDatabase.Country(ip).Country.Name;
+				return Game.GeoIpDatabase.Country(ip).Country.Name ?? Unknown;
 			}
 			catch (Exception e)
 			{
 				Log.Write("geoip", "LookupCountry failed: {0}", e);
-				return "Unknown Location";
+				return Unknown;
 			}
 		}