Merge pull request #782 from garakutanokiseki/feature/fix-android-can…

…t-read-animation-sprite Fix crash at loading AnimationSprite on Android.
craftworkgames · Oct 23, 2022 · cbbec7d · cbbec7d
2 parents 0ebbbe5 + a47e066
commit cbbec7d
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/cs/MonoGame.Extended/TextureAtlases/TextureAtlasJsonConverter.cs b/src/cs/MonoGame.Extended/TextureAtlases/TextureAtlasJsonConverter.cs
@@ -53,8 +53,17 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 var directory = Path.GetDirectoryName(_path);
                 var relativePath = Path.Combine(_contentManager.RootDirectory, directory, textureDirectory, textureName);
                 var resolvedAssetName = Path.GetFullPath(relativePath);
-                var texture = _contentManager.Load<Texture2D>(resolvedAssetName);
-
+                Texture2D texture;
+                try
+                {
+                    texture = _contentManager.Load<Texture2D>(resolvedAssetName);
+                }
+                catch (Exception ex) {
+                    if (textureDirectory == null || textureDirectory == "") 
+                        texture = _contentManager.Load<Texture2D>(textureName);
+                    else
+                        texture = _contentManager.Load<Texture2D>(textureDirectory + "/" + textureName);
+                }
                 return TextureAtlas.Create(resolvedAssetName, texture, metadata.RegionWidth, metadata.RegionHeight);
             }
         }