Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions 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
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
external/solanaceae_message3 vendored

Submodule external/solanaceae_message3 updated: 48fb5f0889...1a036c2321

2
external/solanaceae_util vendored

Submodule external/solanaceae_util updated: 92eee153f2...2b20c2d2a4

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());