Remove Map usage from LobbyLogic.

2016-03-12 21:45:51 +00:00
parent ad2c6e9c11
commit ab6a9597bb
3 changed files with 91 additions and 91 deletions
--- a/OpenRA.Game/Map/MapPreview.cs
+++ b/OpenRA.Game/Map/MapPreview.cs
@@ -81,6 +81,7 @@ namespace OpenRA
 		Lazy<Ruleset> rules;
 		public Ruleset Rules { get { return rules != null ? rules.Value : null; } }
 		public bool InvalidCustomRules { get; private set; }
+		public bool RulesLoaded { get; private set; }

 		Download download;
 		public long DownloadBytes { get; private set; }
@@ -225,9 +226,12 @@ namespace OpenRA
 				catch
 				{
 					InvalidCustomRules = true;
+					return Ruleset.LoadDefaultsForTileSet(modData, TileSet);
+				}
+				finally
+				{
+					RulesLoaded = true;
 				}
-
-				return Ruleset.LoadDefaultsForTileSet(modData, TileSet);
 			});

 			if (p.Contains("map.png"))