Add workaround for texture freeing bug in SharpDX

CnCNet · Jan 30, 2024 · c5c66cb · c5c66cb
1 parent 0d16c05
commit c5c66cb
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/TSMapEditor/Rendering/MGTMPImage.cs b/src/TSMapEditor/Rendering/MGTMPImage.cs
@@ -1,5 +1,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using Rampastring.Tools;
+using System;
 using TSMapEditor.CCEngine;
 
 namespace TSMapEditor.Rendering
@@ -48,8 +50,19 @@ public MGTMPImage(GraphicsDevice gd, TmpImage tmpImage, Palette palette, int til
 
         public void Dispose()
         {
-            if (Texture != null)
-                Texture.Dispose();
+            if (Texture == null && ExtraTexture == null)
+                return;
+
+            // Workaround for a bug in SharpDX where it can crash when freeing a texture
+            try
+            {
+                Texture?.Dispose();
+                ExtraTexture?.Dispose();
+            }
+            catch (InvalidOperationException)
+            {
+                Logger.Log($"Failed to free a TMP texture! TileSet: {TileSetId}");
+            }
         }
 
         private Texture2D TextureFromTmpImage(GraphicsDevice graphicsDevice, TmpImage image, Palette palette)