From 6c3e127469556d37c9eb282c00d87e96c1493c12 Mon Sep 17 00:00:00 2001 From: Taryn Hill Date: Fri, 12 Jun 2015 23:00:43 -0500 Subject: [PATCH 1/2] Replace a problematic Get with GetOrNull in MapEditorLogic. --- OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs index 2a1ee4a80b..b8d3164a2d 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs @@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic gridButton.IsHighlighted = () => terrainGeometryTrait.Enabled; } - var zoomDropdown = widget.Get("ZOOM_BUTTON"); + var zoomDropdown = widget.GetOrNull("ZOOM_BUTTON"); if (zoomDropdown != null) { var selectedZoom = Game.Settings.Graphics.PixelDouble ? 2f : 1f; From 8fd82f0998e60aac398b3dd5c04a233ff881d558 Mon Sep 17 00:00:00 2001 From: Taryn Hill Date: Fri, 12 Jun 2015 23:00:57 -0500 Subject: [PATCH 2/2] Remove unused using directives from MapEditorLogic. --- OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs index b8d3164a2d..c0a88b155d 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs @@ -9,12 +9,8 @@ #endregion using System; -using System.Drawing; -using System.Linq; using OpenRA.Graphics; using OpenRA.Mods.Common.Traits; -using OpenRA.Primitives; -using OpenRA.Traits; using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic