update subs

Green-Sky · Dec 12, 2023 · 1cdde51 · 1cdde51
1 parent 4248d1d
commit 1cdde51
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/external/solanaceae_message3 b/external/solanaceae_message3
diff --git a/external/solanaceae_util b/external/solanaceae_util
diff --git 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 <solanaceae/message3/components.hpp>
 
@@ -22,6 +23,10 @@ std::optional<TextureEntry> MessageImageLoader::load(TextureUploaderI& tu, Messa
 		return std::nullopt;
 	}
 
+	if (m.all_of<Message::Components::TagNotImage>()) {
+		return std::nullopt;
+	}
+
 	if (m.all_of<Message::Components::Transfer::FileInfoLocal>()) {
 		const auto& file_list = m.get<Message::Components::Transfer::FileInfoLocal>().file_list;
 		assert(!file_list.empty());
+5 −0		solanaceae/message3/registry_message_model.cpp
+8 −1		solanaceae/message3/registry_message_model.hpp
+54 −0		solanaceae/util/config_model.hpp
+3 −2		solanaceae/util/config_model.inl
+63 −0		solanaceae/util/simple_config_model.cpp
+34 −0		solanaceae/util/simple_config_model.hpp