Fix the handling of maps with invalid rules. Fixes #6787.

2014-10-19 15:52:04 +13:00
parent 6556cfc667
commit 50643b0cfe
2 changed files with 18 additions and 11 deletions
--- a/OpenRA.Game/Map/MapPreview.cs
+++ b/OpenRA.Game/Map/MapPreview.cs
@@ -237,16 +237,8 @@ namespace OpenRA
 			if (RuleStatus != MapRuleStatus.Unknown)
 				return;

-			try
-			{
-				Map.PreloadRules();
-				RuleStatus = MapRuleStatus.Cached;
-			}
-			catch (Exception e)
-			{
-				Log.Write("debug", "Map {0} failed validation with an exception:\n{1}", Uid, e.Message);
-				RuleStatus = MapRuleStatus.Invalid;
-			}
+			Map.PreloadRules();
+			RuleStatus = Map.InvalidCustomRules ? MapRuleStatus.Invalid : MapRuleStatus.Cached;
 		}
 	}
 }