# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1254166850 0
# Node ID 9a215113c84cbb034ba4ef0cbef512bad0590ff9
# Parent  74d3efaac80093ec921d4e5c65bb886d6b3e4bbb
Re #184: Unhandled exception in the unit form
 * Perform null check before trying to open "edit" dialog
(Fixes the other part of Snowblizz's post)
no-open-ticket

diff -r 74d3efaac800 -r 9a215113c84c FrmUnit.cs
--- a/FrmUnit.cs	Mon Sep 28 19:19:34 2009 +0000
+++ b/FrmUnit.cs	Mon Sep 28 19:40:50 2009 +0000
@@ -462,8 +462,13 @@
 
 		private void EditWeapon()
 		{
-			FrmEditUnitEquipment editEquip = new FrmEditUnitEquipment(Unit, GetSelectedUnitEquipmentItem(), commandStack);
-			editEquip.ShowDialog(this);
+			UnitEquipmentItem item = GetSelectedUnitEquipmentItem();
+
+			if (item != null)
+			{
+				FrmEditUnitEquipment editEquip = new FrmEditUnitEquipment(Unit, item, commandStack);
+				editEquip.ShowDialog(this);
+			}
 		}
 
 		private UnitEquipmentItem GetSelectedUnitEquipmentItem()