diff --git a/external/solanaceae_object_store b/external/solanaceae_object_store index 18d2888..e5b3546 160000 --- a/external/solanaceae_object_store +++ b/external/solanaceae_object_store @@ -1 +1 @@ -Subproject commit 18d2888e3452074245375f329d90520ac250b595 +Subproject commit e5b3546292c906da4680f838c235e3464476917b diff --git a/external/solanaceae_tox b/external/solanaceae_tox index 09300c1..d91ad4b 160000 --- a/external/solanaceae_tox +++ b/external/solanaceae_tox @@ -1 +1 @@ -Subproject commit 09300c1702f9bfb4cc857b904da33d51a94e0fe3 +Subproject commit d91ad4bfa922e729b690e68858a5f48468f3b8fa diff --git a/src/chat_gui4.cpp b/src/chat_gui4.cpp index 0599ffe..5d7159b 100644 --- a/src/chat_gui4.cpp +++ b/src/chat_gui4.cpp @@ -1318,7 +1318,7 @@ void ChatGui4::renderMessageBodyFile(Message3Registry& reg, const Message3 e) { // deploy dummy of framedim size and check visibility // +2 for border ImGui::Dummy(ImVec2{width+2, height+2}); - if (ImGui::IsItemVisible() && o.all_of()) { + if (ImGui::IsItemVisible() && o.all_of()) { ImGui::SetCursorPos(orig_curser_pos); // reset for actual img auto [id, img_width, img_height] = _msg_tc.get(Message3Handle{reg, e}); diff --git a/src/media_meta_info_loader.cpp b/src/media_meta_info_loader.cpp index 93939c8..fd2bdc9 100644 --- a/src/media_meta_info_loader.cpp +++ b/src/media_meta_info_loader.cpp @@ -45,8 +45,8 @@ void MediaMetaInfoLoader::handleMessage(const Message3Handle& m) { return; // we dont have all data } - if (!o.all_of()) { - std::cerr << "MMIL error: object missing backend/file info (?)\n"; + if (!o.all_of()) { + std::cerr << "MMIL error: object missing file backend/file info (?)\n"; return; } @@ -68,14 +68,14 @@ void MediaMetaInfoLoader::handleMessage(const Message3Handle& m) { return; } - auto* file_backend = o.get().ptr; + auto* file_backend = o.get().ptr; if (file_backend == nullptr) { std::cerr << "MMIL error: object backend nullptr\n"; return; } - auto file2 = file_backend->file2(o, StorageBackendI::FILE2_READ); + auto file2 = file_backend->file2(o, StorageBackendIFile2::FILE2_READ); if (!file2 || !file2->isGood() || !file2->can_read) { std::cerr << "MMIL error: creating file2 from object via backendI\n"; return; diff --git a/src/message_image_loader.cpp b/src/message_image_loader.cpp index b8ca579..a1971db 100644 --- a/src/message_image_loader.cpp +++ b/src/message_image_loader.cpp @@ -45,8 +45,8 @@ TextureLoaderResult MessageImageLoader::load(TextureUploaderI& tu, Message3Handl return {std::nullopt}; } - if (!o.all_of()) { - std::cerr << "MIL error: object missing backend (?)\n"; + if (!o.all_of()) { + std::cerr << "MIL error: object missing file backend (?)\n"; return {std::nullopt}; } @@ -68,13 +68,13 @@ TextureLoaderResult MessageImageLoader::load(TextureUploaderI& tu, Message3Handl return {std::nullopt}; } - auto* file_backend = o.get().ptr; + auto* file_backend = o.get().ptr; if (file_backend == nullptr) { std::cerr << "MIL error: object backend nullptr\n"; return {std::nullopt}; } - auto file2 = file_backend->file2(o, StorageBackendI::FILE2_READ); + auto file2 = file_backend->file2(o, StorageBackendIFile2::FILE2_READ); if (!file2 || !file2->isGood() || !file2->can_read) { std::cerr << "MIL error: creating file2 from object via backendI\n"; return {std::nullopt};