Merge pull request #112 from floydinator-git/image-fix

Fix images added by assets.add not working in-game.

1 files changed, 5 insertions, 1 deletions

diff --git a/source/game/StarImageMetadataDatabase.cpp b/source/game/StarImageMetadataDatabase.cpp
index bf84e51..d04e984 100644
--- a/source/game/StarImageMetadataDatabase.cpp
+++ b/source/game/StarImageMetadataDatabase.cpp
@@ -174,7 +174,11 @@ Vec2U ImageMetadataDatabase::calculateImageSize(AssetPath const& path) const {
       imageSize = *size;
     } else {
       locker.unlock();
-      imageSize = get<0>(Image::readPngMetadata(assets->openFile(path.basePath)));
+      auto file = assets->openFile(path.basePath);
+      if (Image::isPng(file))
+        imageSize = get<0>(Image::readPngMetadata(file));
+      else
+        imageSize = fallback();
       locker.lock();
       m_sizeCache[path.basePath] = imageSize;
     }