From 853343413a84bab62d52f4f44d587c21e9e1ac27 Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Sun, 31 Jul 2022 12:43:13 +0200
Subject: [PATCH] Simplefied deleteFileToolStrip

---
 MinecraftUSkinEditor/MainForm.cs | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/MinecraftUSkinEditor/MainForm.cs b/MinecraftUSkinEditor/MainForm.cs
index 3b284626..ea2a2dea 100644
--- a/MinecraftUSkinEditor/MainForm.cs
+++ b/MinecraftUSkinEditor/MainForm.cs
@@ -427,22 +427,19 @@ namespace PckStudio
             {
                 PCKFile.FileData file = node.Tag as PCKFile.FileData;
                 // remove loc key if its a skin/cape
-                if (file.type == 0 || file.type == 1)
+                if ((file.type == 0 || file.type == 1) && TryGetLocFile(out LOCFile locFile))
                 {
-                    LOCFile locFile = null;
-                    if (TryGetLocFile(out locFile))
-                    {
-                        foreach (var property in file.properties)
-                        {
-                            if (property.Item1 == "THEMENAMEID" || property.Item1 == "DISPLAYNAMEID")
-                                locFile.RemoveLocKey(property.Item2);
-                        }
-                        TrySetLocFile(locFile);
-                    }
+                    if (file.properties.HasProperty("THEMENAMEID"))
+                        locFile.RemoveLocKey(file.properties.GetProperty("THEMENAMEID").Item2);
+                    if (file.properties.HasProperty("DISPLAYNAMEID"))
+                        locFile.RemoveLocKey(file.properties.GetProperty("DISPLAYNAMEID").Item2);
+                    TrySetLocFile(locFile);
+                }
+                if (currentPCK.Files.Remove(file))
+                {
+                    node.Remove();
+                    saved = false;
                 }
-                currentPCK.Files.Remove(file);
-                node.Remove();
-                saved = false;
             }
             else if (MessageBox.Show("Are you sure want to delete this folder? All contents will be deleted", "Warning",
                 MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
@@ -598,7 +595,7 @@ namespace PckStudio
                     }
                     catch (Exception ex)
                     {
-                        MessageBox.Show("Error", ex.Message, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         return;
                     }
                     break;