From b5262d69b079a0b6d978ed0a356c3d7fd075c396 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 12 Apr 2023 23:22:33 -0700
Subject: [PATCH] Dispose of file-loaded bitmap after use

Image.FromFile locks the file until the object is disposed; adjust all uses of Image.FromFile to dispose when finished.

Closes #3857 ty @SNBeast !
---
 PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Misc4.cs     | 4 +---
 PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Misc4.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Misc4.cs
index 3a4a8cb32..138ff18eb 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Misc4.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_Misc4.cs	
@@ -288,9 +288,7 @@ private void SetFlagsFromFileName(string inpFileName)
         if (FileUtil.GetFileSize(inpFileName) > 2058)
             return; // 24*20*4(ARGB)=1920
 
-        Bitmap bmp; try { bmp = (Bitmap)Image.FromFile(inpFileName); }
-        catch { return; }
-
+        using var bmp = (Bitmap)Image.FromFile(inpFileName);
         if (bmp.Width != 24 || bmp.Height != 20)
             return;
 
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs
index cad7331c2..f1f7ed6bd 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs	
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
@@ -38,8 +38,7 @@ private void B_ImportPNG_Click(object sender, EventArgs e)
         if (ofd.ShowDialog() != DialogResult.OK)
             return;
 
-        Bitmap img = (Bitmap)Image.FromFile(ofd.FileName);
-
+        using var img = (Bitmap)Image.FromFile(ofd.FileName);
         try
         {
             bg = CGearImage.GetCGearBackground(img);