# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1253043701 0
# Node ID c972fb28367571ae627a5e2fd990935c12cd7d53
# Parent  93b3d23147ba90b7305cca90acf143dde99a5847
Fixes #149: Crash with edit on null tree item
 * Clean up code - can't seem to recreate

diff -r 93b3d23147ba -r c972fb283675 FrmArmyTree.cs
--- a/FrmArmyTree.cs	Mon Sep 14 20:43:52 2009 +0000
+++ b/FrmArmyTree.cs	Tue Sep 15 19:41:41 2009 +0000
@@ -314,19 +314,21 @@
 		private void EditUnit()
 		{
 			TreeNode selected = treeView.SelectedNode;
+			object tagData = selected.Tag;
 
-			if (selected.Tag!=null && selected.Tag is Unit)
+			if (tagData is Unit)
 			{
-				Unit unit = (Unit)selected.Tag;
+				Unit unit = (Unit) tagData;
+				string unitID = unit.ID;
 
-				if (unitWindows.ContainsKey(unit.ID))
+				if (unitWindows.ContainsKey(unitID))
 				{
-					unitWindows[unit.ID].Focus();
+					unitWindows[unitID].Focus();
 				}
 				else
 				{
 					FrmUnit unitForm = new FrmUnit(unit, commandStack);
-					unitWindows.Add(unit.ID, unitForm);
+					unitWindows.Add(unitID, unitForm);
 					unitForm.MdiParent = this.MdiParent;
 					unitForm.Closing+=new CancelEventHandler(unitForm_Closing);
 					unitForm.Show();