Addition to #170.

Author: KN4CK3R

ReClass.NET/Forms/MainForm.Functions.cs

@@ -412,12 +412,10 @@ private void PasteNodeFromClipboardToSelection()
 
 		private void EditSelectedNodeName()
 		{
-			var selected = memoryViewControl.GetSelectedNodes();
-			var selectedNode = selected.FirstOrDefault();
-
-			if (selected.Count == 1)
+			var selectedNodes = memoryViewControl.GetSelectedNodes();
+			if (selectedNodes.Count == 1)
 			{
-				memoryViewControl.ShowEditBoxForName(selectedNode);
+				memoryViewControl.ShowNodeNameEditBox(selectedNodes[0].Node);
 			}
 		}
 

ReClass.NET/UI/MemoryViewControl.cs

@@ -354,11 +354,7 @@ protected override void OnMouseDoubleClick(MouseEventArgs e)
 					}
 					if (hotSpot.Type == HotSpotType.Edit)
 					{
-						editBox.BackColor = Program.Settings.SelectedColor;
-						editBox.HotSpot = hotSpot;
-						editBox.Visible = true;
-
-						editBox.ReadOnly = hotSpot.Id == HotSpot.ReadOnlyId;
+						ShowNodeNameEditBox(hotSpot);
 
 						break;
 					}
@@ -381,20 +377,29 @@ protected override void OnMouseDoubleClick(MouseEventArgs e)
 			base.OnMouseDoubleClick(e);
 		}
 
-		public void ShowEditBoxForName(SelectedNodeInfo selection)
+		public void ShowNodeNameEditBox(BaseNode node)
 		{
-			var hotSpot = hotSpots.FirstOrDefault(spot => spot.Address == selection.Address &&
-			                                                      spot.Type == HotSpotType.Edit &&
-			                                                      spot.Text == selection.Node.Name);
+			if (node == null || node is BaseHexNode)
+			{
+				return;
+			}
+
+			var hotSpot = hotSpots
+				.FirstOrDefault(s => s.Node == node && s.Type == HotSpotType.Edit && s.Id == HotSpot.NameId);
 			if (hotSpot != null)
 			{
-				editBox.BackColor = Program.Settings.SelectedColor;
-				editBox.HotSpot = hotSpot;
-				editBox.Visible = true;
-				editBox.ReadOnly = false;
+				ShowNodeNameEditBox(hotSpot);
 			}
 		}
 
+		private void ShowNodeNameEditBox(HotSpot hotSpot)
+		{
+			editBox.BackColor = Program.Settings.SelectedColor;
+			editBox.HotSpot = hotSpot;
+			editBox.Visible = true;
+			editBox.ReadOnly = hotSpot.Id == HotSpot.ReadOnlyId;
+		}
+
 		private Point toolTipPosition;
 		protected override void OnMouseHover(EventArgs e)
 		{