Merge pull request #12 from JuGGerNaunT/fix_issue11

fixed AccessViolationException crash when switching between gm1 items
PodeCaradox · Apr 24, 2020 · b0744f9 · b0744f9
2 parents fcab4be + 4380f7d
commit b0744f9
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/Gm1KonverterCrossPlatform/Files/DecodedFile.cs b/Gm1KonverterCrossPlatform/Files/DecodedFile.cs
@@ -8,7 +8,7 @@
 
 namespace Files.Gm1Converter
 {
-    class DecodedFile
+    class DecodedFile : IDisposable
     {
 
         #region Variables
@@ -147,6 +147,17 @@ public byte[] GetNewGM1Bytes()
             return newFile.ToArray();
         }
 
+        public void Dispose()
+        {
+            if (tilesImage != null)
+            {
+                foreach (TilesImage image in tilesImage)
+                {
+                    image.Dispose();
+                }
+            }
+        }
+
         /// <summary>
         /// Creates the IMG from the byte array, handles Animation,Interfaces,TGXConstSize, Font
         /// </summary>
@@ -232,6 +243,7 @@ private void CreateImgHeader(byte[] array)
         private void CreateTileImage(byte[] array)
         {
             if (Logger.Loggeractiv) Logger.Log("CreateTileImage");
+            Dispose();
             CreateOffsetAndSizeInByteArrayList(array);
             CreateImgHeader(array);
 

diff --git a/Gm1KonverterCrossPlatform/Files/TilesImage.cs b/Gm1KonverterCrossPlatform/Files/TilesImage.cs
@@ -6,7 +6,7 @@
 
 namespace Gm1KonverterCrossPlatform.Files
 {
-    class TilesImage
+    class TilesImage : IDisposable
     {
 
         #region Public
@@ -51,6 +51,14 @@ public TilesImage(int width, int height)
 
         #region Methods
 
+        public void Dispose()
+        {
+            if (bmp != null)
+            {
+                bmp.Dispose();
+            }
+        }
+
         /// <summary>
         /// Add the Diamond Tile Img to the bigger Img
         /// </summary>
@@ -179,6 +187,8 @@ internal void AddImgTileOnTopToImg(byte[] imgFileAsBytearray, int offsetX, int o
         /// </summary>
         internal unsafe void CreateImagefromList()
         {
+            Dispose();
+
             if (minusHeight == 9999999)
             {
                 //is used for the correct height of the bitmap

diff --git a/Gm1KonverterCrossPlatform/ViewModels/MainWindowViewModel.cs b/Gm1KonverterCrossPlatform/ViewModels/MainWindowViewModel.cs
@@ -16,7 +16,7 @@
 
 namespace Gm1KonverterCrossPlatform.ViewModels
 {
-    public class MainWindowViewModel : ViewModelBase
+    public class MainWindowViewModel : ViewModelBase, IDisposable
     {
 
         #region Variables
@@ -383,6 +383,25 @@ internal ObservableCollection<Image> TGXImages
 
         #region Methods
 
+        ~MainWindowViewModel()
+        {
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (File != null)
+            {
+                File.Dispose();
+            }
+        }
+
         /// <summary>
         /// Load the GM1 Files from the CrusaderPath
         /// </summary>
@@ -434,6 +453,7 @@ internal bool DecodeData(string fileName, Window window)
             //Convert Selected file
             try
             {
+                Dispose();
                 File = new DecodedFile();
                 if (!File.DecodeGm1File(Utility.FileToByteArray(userConfig.CrusaderPath + "\\" + fileName), fileName))
                 {