[HaRepacker] Fixed an issue with renaming TreeView nodes (pointing to…

… selected node instead of the node right-clicked)
lastbattle · Jul 14, 2020 · 56bac4c · 56bac4c
1 parent fe48e73
commit 56bac4c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/HaRepacker/GUI/ContextMenuManager.cs b/HaRepacker/GUI/ContextMenuManager.cs
@@ -87,7 +87,9 @@ public ContextMenuManager(MainPanel haRepackerMainPanel, UndoRedoManager undoMan
             Rename = new ToolStripMenuItem("Rename", Properties.Resources.rename, new EventHandler(
                 delegate (object sender, EventArgs e)
                 {
-                    haRepackerMainPanel.PromptRenameSelectedTreeNode();
+                    WzNode currentNode = currNode;
+
+                    haRepackerMainPanel.PromptRenameWzTreeNode(currentNode);
                 }));
             Remove = new ToolStripMenuItem("Remove", Properties.Resources.delete, new EventHandler(
                 delegate (object sender, EventArgs e)
@@ -130,7 +132,6 @@ public ContextMenuManager(MainPanel haRepackerMainPanel, UndoRedoManager undoMan
                 {
                     foreach (WzNode node in GetNodes(sender))
                     {
-
                         node.ExpandAll();
                     }
                 }));

diff --git a/HaRepacker/GUI/Panels/MainPanel.xaml.cs b/HaRepacker/GUI/Panels/MainPanel.xaml.cs
@@ -531,17 +531,13 @@ public void PromptRemoveSelectedTreeNodes()
         /// <summary>
         /// Rename an individual node
         /// </summary>
-        public void PromptRenameSelectedTreeNode()
+        public void PromptRenameWzTreeNode(WzNode node)
         {
-            if (DataTree.SelectedNodes.Count != 1)
-            {
+            if (node == null)
                 return;
-            }
 
             string newName = "";
-            System.Windows.Forms.TreeNode currentSelectedNode = DataTree.SelectedNodes[0] as System.Windows.Forms.TreeNode;
-            WzNode wzNode = (WzNode)currentSelectedNode;
-
+            WzNode wzNode = node;
             if (RenameInputBox.Show(Properties.Resources.MainConfirmRename, wzNode.Text, out newName))
             {
                 wzNode.ChangeName(newName);