From 081bafdbdd2220d9449398d4077266c483931627 Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Sat, 25 Jun 2022 23:51:25 +0200
Subject: [PATCH] Update LOCEditor and simplefied key donw delete call

---
 .../Forms/Utilities/LOCEditor.cs              | 23 +++++++++++--------
 .../Forms/Utilities/LOCEditor.resx            | 18 +++++++--------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/MinecraftUSkinEditor/Forms/Utilities/LOCEditor.cs b/MinecraftUSkinEditor/Forms/Utilities/LOCEditor.cs
index 9261c746..2a0ff9ce 100644
--- a/MinecraftUSkinEditor/Forms/Utilities/LOCEditor.cs
+++ b/MinecraftUSkinEditor/Forms/Utilities/LOCEditor.cs
@@ -16,7 +16,8 @@ namespace PckStudio
     {
 		DataTable tbl;
 		LOCFile currentLoc;
-		public bool wasModified { get; private set; } = true;
+		bool wasModified = false;
+		public bool WasModified => wasModified;
 
 		public LOCEditor(LOCFile loc)
 		{
@@ -59,7 +60,10 @@ namespace PckStudio
 			RenamePrompt diag = new RenamePrompt(node.Text);
 			diag.ShowDialog(this);
 			if (diag.DialogResult == DialogResult.OK)
-                currentLoc.ChangeEntry(node.Text, diag.NewText);
+			{
+				currentLoc.ChangeEntry(node.Text, diag.NewText);
+				wasModified = true;
+			}
 			diag.Dispose();
 		}
 
@@ -75,8 +79,11 @@ namespace PckStudio
 		{
 			if(treeViewLocEntries.SelectedNode != null && currentLoc.keys.ContainsKey(treeViewLocEntries.SelectedNode.Text))
 			{
-                currentLoc.keys.Remove(treeViewLocEntries.SelectedNode.Text);
-				treeViewLocEntries.SelectedNode.Remove();
+				if (currentLoc.keys.Remove(treeViewLocEntries.SelectedNode.Text))
+				{
+					treeViewLocEntries.SelectedNode.Remove();
+					wasModified = true;
+				}
             }
 		}
 
@@ -93,12 +100,8 @@ namespace PckStudio
 
         private void treeView1_KeyDown(object sender, KeyEventArgs e)
 		{
-			if (e.KeyData == Keys.Delete && treeViewLocEntries.SelectedNode != null) //checks to make sure pressed key was del
-			{
-                currentLoc.keys.Remove(treeViewLocEntries.SelectedNode.Text);
-                treeViewLocEntries.SelectedNode.Remove();
-				wasModified = true;
-			}
+			if (e.KeyData == Keys.Delete)
+				deleteDisplayIDToolStripMenuItem_Click(sender, e);
 		}
 
 		private void buttonReplaceAll_Click(object sender, EventArgs e)
diff --git a/MinecraftUSkinEditor/Forms/Utilities/LOCEditor.resx b/MinecraftUSkinEditor/Forms/Utilities/LOCEditor.resx
index 76304620..46cceab9 100644
--- a/MinecraftUSkinEditor/Forms/Utilities/LOCEditor.resx
+++ b/MinecraftUSkinEditor/Forms/Utilities/LOCEditor.resx
@@ -121,15 +121,6 @@
     <value>17, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>173, 70</value>
-  </data>
-  <data name="&gt;&gt;contextMenuStrip1.Name" xml:space="preserve">
-    <value>contextMenuStrip1</value>
-  </data>
-  <data name="&gt;&gt;contextMenuStrip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="addDisplayIDToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>172, 22</value>
   </data>
@@ -148,6 +139,15 @@
   <data name="deleteDisplayIDToolStripMenuItem.Text" xml:space="preserve">
     <value>Delete Display ID</value>
   </data>
+  <data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>173, 70</value>
+  </data>
+  <data name="&gt;&gt;contextMenuStrip1.Name" xml:space="preserve">
+    <value>contextMenuStrip1</value>
+  </data>
+  <data name="&gt;&gt;contextMenuStrip1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="locSort.ColumnCount" type="System.Int32, mscorlib">
     <value>3</value>