From 45bf9251c95013141fe620835f764f13b66afb49 Mon Sep 17 00:00:00 2001 From: VaDiM Date: Sat, 28 Oct 2023 02:14:59 +0300 Subject: [PATCH] Fix crash when SpriteAtlas is missing --- AssetStudio/AssetsManager.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/AssetStudio/AssetsManager.cs b/AssetStudio/AssetsManager.cs index f243569..b00ef27 100644 --- a/AssetStudio/AssetsManager.cs +++ b/AssetStudio/AssetsManager.cs @@ -41,7 +41,7 @@ namespace AssetStudio { filteredAssetTypesList.Add(ClassIDType.Texture2D); } - + filteredAssetTypesList.UnionWith(classIDTypes); } @@ -635,14 +635,17 @@ namespace AssetStudio { m_Sprite.m_SpriteAtlas.Set(m_SpriteAtlas); } - else + else if (m_Sprite.m_SpriteAtlas.TryGet(out var m_SpriteAtlaOld)) { - m_Sprite.m_SpriteAtlas.TryGet(out var m_SpriteAtlaOld); if (m_SpriteAtlaOld.m_IsVariant) { m_Sprite.m_SpriteAtlas.Set(m_SpriteAtlas); } } + else + { + Logger.Warning($"\"{m_Sprite.m_Name}\": Sprite loading error. SpriteAtlas with PathID: \"{m_Sprite.m_SpriteAtlas.m_PathID}\" was not found."); + } } } }