修复atlas null 引用导致的闪退

2025-05-08 18:34:43 +08:00
parent e06d2012d6
commit 12a168df92
7 changed files with 28 additions and 14 deletions
--- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject21.cs
+++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject21.cs
@@ -50,7 +50,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject

        public SpineObject21(string skelPath, string atlasPath) : base(skelPath, atlasPath)
        {
-            atlas = new Atlas(AtlasPath, textureLoader);
+            try { atlas = new Atlas(AtlasPath, textureLoader); }
+            catch (Exception ex) { throw new InvalidDataException($"Failed to load atlas '{atlasPath}'", ex); }
            try
            {
                // 先尝试二进制文件
@@ -70,6 +71,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
                catch
                {
                    // 都不行就报错
+                    atlas.Dispose();
                    throw new InvalidDataException($"Unknown skeleton file format {SkelPath}");
                }
            }
@@ -96,7 +98,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
        protected override void Dispose(bool disposing)
        {
            base.Dispose(disposing);
-            atlas.Dispose();
+            atlas?.Dispose();
        }

        public override string FileVersion { get => skeletonData.Version; }
--- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject36.cs
+++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject36.cs
@@ -49,7 +49,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject

        public SpineObject36(string skelPath, string atlasPath) : base(skelPath, atlasPath)
        {
-            atlas = new Atlas(AtlasPath, textureLoader);
+            try { atlas = new Atlas(AtlasPath, textureLoader); }
+            catch (Exception ex) { throw new InvalidDataException($"Failed to load atlas '{atlasPath}'", ex); }
            try
            {
                // 先尝试二进制文件
@@ -69,6 +70,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
                catch
                {
                    // 都不行就报错
+                    atlas.Dispose();
                    throw new InvalidDataException($"Unknown skeleton file format {SkelPath}");
                }
            }
@@ -95,7 +97,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
        protected override void Dispose(bool disposing)
        {
            base.Dispose(disposing);
-            atlas.Dispose();
+            atlas?.Dispose();
        }

        public override string FileVersion { get => skeletonData.Version; }
--- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject37.cs
+++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject37.cs
@@ -46,7 +46,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject

        public SpineObject37(string skelPath, string atlasPath) : base(skelPath, atlasPath)
        {
-            atlas = new Atlas(AtlasPath, textureLoader);
+            try { atlas = new Atlas(AtlasPath, textureLoader); }
+            catch (Exception ex) { throw new InvalidDataException($"Failed to load atlas '{atlasPath}'", ex); }
            try
            {
                // 先尝试二进制文件
@@ -66,6 +67,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
                catch
                {
                    // 都不行就报错
+                    atlas.Dispose();
                    throw new InvalidDataException($"Unknown skeleton file format {SkelPath}");
                }
            }
@@ -92,7 +94,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
        protected override void Dispose(bool disposing)
        {
            base.Dispose(disposing);
-            atlas.Dispose();
+            atlas?.Dispose();
        }

        public override string FileVersion { get => skeletonData.Version; }
--- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject38.cs
+++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject38.cs
@@ -50,7 +50,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject

        public SpineObject38(string skelPath, string atlasPath) : base(skelPath, atlasPath)
        {
-            atlas = new Atlas(AtlasPath, textureLoader);
+            try { atlas = new Atlas(AtlasPath, textureLoader); }
+            catch (Exception ex) { throw new InvalidDataException($"Failed to load atlas '{atlasPath}'", ex); }
            try
            {
                // 先尝试二进制文件
@@ -70,6 +71,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
                catch (Exception ex)
                {
                    // 都不行就报错
+                    atlas.Dispose();
                    throw new InvalidDataException($"Unknown skeleton file format {SkelPath}", ex);
                }
            }
@@ -96,7 +98,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
        protected override void Dispose(bool disposing)
        {
            base.Dispose(disposing);
-            atlas.Dispose();
+            atlas?.Dispose();
        }

        public override string FileVersion { get => skeletonData.Version; }
--- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject40.cs
+++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject40.cs
@@ -48,7 +48,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject

        public SpineObject40(string skelPath, string atlasPath) : base(skelPath, atlasPath)
        {
-            atlas = new Atlas(AtlasPath, textureLoader);
+            try { atlas = new Atlas(AtlasPath, textureLoader); }
+            catch (Exception ex) { throw new InvalidDataException($"Failed to load atlas '{atlasPath}'", ex); }
            try
            {
                // 先尝试二进制文件
@@ -68,6 +69,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
                catch
                {
                    // 都不行就报错
+                    atlas.Dispose();
                    throw new InvalidDataException($"Unknown skeleton file format {SkelPath}");
                }
            }
@@ -95,7 +97,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
        protected override void Dispose(bool disposing)
        {
            base.Dispose(disposing);
-            atlas.Dispose();
+            atlas?.Dispose();
        }

        public override string FileVersion { get => skeletonData.Version; }
--- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject41.cs
+++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject41.cs
@@ -48,7 +48,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject

        public SpineObject41(string skelPath, string atlasPath) : base(skelPath, atlasPath)
        {
-            atlas = new Atlas(AtlasPath, textureLoader);
+            try { atlas = new Atlas(AtlasPath, textureLoader); }
+            catch (Exception ex) { throw new InvalidDataException($"Failed to load atlas '{atlasPath}'", ex); }
            try
            {
                // 先尝试二进制文件
@@ -68,6 +69,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
                catch
                {
                    // 都不行就报错
+                    atlas.Dispose();
                    throw new InvalidDataException($"Unknown skeleton file format {SkelPath}");
                }
            }
@@ -95,7 +97,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
        protected override void Dispose(bool disposing)
        {
            base.Dispose(disposing);
-            atlas.Dispose();
+            atlas?.Dispose();
        }

        public override string FileVersion { get => skeletonData.Version; }
--- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject42.cs
+++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject42.cs
@@ -48,7 +48,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject

        public SpineObject42(string skelPath, string atlasPath) : base(skelPath, atlasPath)
        {
-            atlas = new Atlas(AtlasPath, textureLoader);
+            try { atlas = new Atlas(AtlasPath, textureLoader); }
+            catch (Exception ex) { throw new InvalidDataException($"Failed to load atlas '{atlasPath}'", ex); }
            try
            {
                // 先尝试二进制文件
@@ -68,6 +69,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
                catch
                {
                    // 都不行就报错
+                    atlas.Dispose();
                    throw new InvalidDataException($"Unknown skeleton file format {SkelPath}");
                }
            }
@@ -95,7 +97,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
        protected override void Dispose(bool disposing)
        {
            base.Dispose(disposing);
-            atlas.Dispose();
+            atlas?.Dispose();
        }

        public override string FileVersion { get => skeletonData.Version; }