aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2021-03-31 18:02:27 +0200
committerdec05eba <dec05eba@protonmail.com>2021-03-31 18:02:27 +0200
commit521589c6026246113117a0f8ad568e0061aba46a (patch)
treed5def5bafd3cd2a0f86e3147576096d9711f89cd
parent25217db93f952c95d834e6f32dc2340a2054df0a (diff)
Do not upload thumbnail of thumbnail for videos
-rw-r--r--src/QuickMedia.cpp6
-rw-r--r--src/plugins/Matrix.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp
index 705e8ff..95eb47a 100644
--- a/src/QuickMedia.cpp
+++ b/src/QuickMedia.cpp
@@ -5132,6 +5132,12 @@ namespace QuickMedia {
auto matrix_invites_page_search_bar = create_search_bar("Search...", SEARCH_DELAY_FILTER);
auto matrix_invites_page = std::make_unique<MatrixInvitesPage>(this, matrix, invites_body.get(), matrix_invites_page_search_bar.get());
+ //Tab options_tab = create_menu_selection_tab("Options",
+ //{
+ // { "Notifications", nullptr, 0, [](Program *program) { return std::make_unique<MatrixNotificationsPage>(program); } },
+ // { "Room directory", "Search for search on...", SEARCH_DELAY_FILTER, [](Program *program) { return std::make_unique<MatrixRoomDirectoryPage>(program); } }
+ //});
+
MatrixQuickMedia matrix_handler(this, matrix, matrix_rooms_page.get(), matrix_rooms_tag_page.get(), matrix_invites_page.get());
bool sync_cached = false;
matrix->start_sync(&matrix_handler, sync_cached);
diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp
index 20bc31e..128e610 100644
--- a/src/plugins/Matrix.cpp
+++ b/src/plugins/Matrix.cpp
@@ -3170,7 +3170,7 @@ namespace QuickMedia {
if(tmp_file != -1) {
if(video_get_first_frame(filepath.c_str(), tmp_filename)) {
UploadInfo upload_info_ignored; // Ignore because it wont be set anyways. Thumbnails dont have thumbnails.
- PluginResult upload_thumbnail_result = upload_file(room, tmp_filename, thumbnail_info, upload_info_ignored, err_msg);
+ PluginResult upload_thumbnail_result = upload_file(room, tmp_filename, thumbnail_info, upload_info_ignored, err_msg, false);
if(upload_thumbnail_result != PluginResult::OK) {
close(tmp_file);
remove(tmp_filename);