From 1cdde5170bae0bfbebe56940ac6b29cceef82c50 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Tue, 12 Dec 2023 16:39:37 +0100 Subject: [PATCH] update subs --- external/solanaceae_message3 | 2 +- external/solanaceae_util | 2 +- src/message_image_loader.cpp | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/external/solanaceae_message3 b/external/solanaceae_message3 index 48fb5f08..1a036c23 160000 --- a/external/solanaceae_message3 +++ b/external/solanaceae_message3 @@ -1 +1 @@ -Subproject commit 48fb5f0889404370006ae12b3637a77d7d4ba485 +Subproject commit 1a036c2321e06d4c36f3e2148e67dfe6aa379296 diff --git a/external/solanaceae_util b/external/solanaceae_util index 92eee153..2b20c2d2 160000 --- a/external/solanaceae_util +++ b/external/solanaceae_util @@ -1 +1 @@ -Subproject commit 92eee153f2c14f97e50f44b10e2a0aeb5f8b190d +Subproject commit 2b20c2d2a45ad1005e794c704b3fc831ca1d3830 diff --git a/src/message_image_loader.cpp b/src/message_image_loader.cpp index 1c02004a..10687905 100644 --- a/src/message_image_loader.cpp +++ b/src/message_image_loader.cpp @@ -3,6 +3,7 @@ #include "./image_loader_sdl_bmp.hpp" #include "./image_loader_stb.hpp" #include "./image_loader_webp.hpp" +#include "./media_meta_info_loader.hpp" #include @@ -22,6 +23,10 @@ std::optional MessageImageLoader::load(TextureUploaderI& tu, Messa return std::nullopt; } + if (m.all_of()) { + return std::nullopt; + } + if (m.all_of()) { const auto& file_list = m.get().file_list; assert(!file_list.empty());