Green-Sky/tomato
Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases 1 Wiki Activity

update subs

Browse Source
This commit is contained in:
Green Sky 2023-12-12 16:39:37 +01:00
parent 4248d1d9ab
commit 1cdde5170b
No known key found for this signature in database
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/solanaceae_message3 vendored

@ -1 +1 @@
Subproject commit 48fb5f0889404370006ae12b3637a77d7d4ba485 Subproject commit 1a036c2321e06d4c36f3e2148e67dfe6aa379296

2
external/solanaceae_util vendored

@ -1 +1 @@
Subproject commit 92eee153f2c14f97e50f44b10e2a0aeb5f8b190d Subproject commit 2b20c2d2a45ad1005e794c704b3fc831ca1d3830

5
src/message_image_loader.cpp
View File

@ -3,6 +3,7 @@
#include "./image_loader_sdl_bmp.hpp" #include "./image_loader_sdl_bmp.hpp"
#include "./image_loader_stb.hpp" #include "./image_loader_stb.hpp"
#include "./image_loader_webp.hpp" #include "./image_loader_webp.hpp"
#include "./media_meta_info_loader.hpp"
#include <solanaceae/message3/components.hpp> #include <solanaceae/message3/components.hpp>
@ -22,6 +23,10 @@ std::optional<TextureEntry> MessageImageLoader::load(TextureUploaderI& tu, Messa
return std::nullopt; return std::nullopt;
} }
if (m.all_of<Message::Components::TagNotImage>()) {
return std::nullopt;
}
if (m.all_of<Message::Components::Transfer::FileInfoLocal>()) { if (m.all_of<Message::Components::Transfer::FileInfoLocal>()) {
const auto& file_list = m.get<Message::Components::Transfer::FileInfoLocal>().file_list; const auto& file_list = m.get<Message::Components::Transfer::FileInfoLocal>().file_list;
assert(!file_list.empty()); assert(!file_list.empty());