From db5d599052a2afc6b30c2dce2ce07029dc4ef153 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 1 May 2020 14:43:02 +0400 Subject: [PATCH] Don't resolve the actual QImage on paste check. --- Telegram/SourceFiles/boxes/edit_caption_box.cpp | 11 +++-------- Telegram/SourceFiles/history/history_widget.cpp | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp index f00f74c3b..948a1150a 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp @@ -548,14 +548,9 @@ void EditCaptionBox::prepare() { if (action == Ui::InputField::MimeAction::Check) { if (!data->hasText() && !_isAllowedEditMedia) { return false; - } - if (data->hasImage()) { - const auto image = qvariant_cast(data->imageData()); - if (!image.isNull()) { - return true; - } - } - if (const auto urls = data->urls(); !urls.empty()) { + } else if (data->hasImage()) { + return true; + } else if (const auto urls = data->urls(); !urls.empty()) { if (ranges::find_if( urls, [](const QUrl &url) { return !url.isLocalFile(); } diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 02a01bb32..001c3a79a 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -4467,20 +4467,15 @@ bool HistoryWidget::confirmSendingFiles( bool HistoryWidget::canSendFiles(not_null data) const { if (!canWriteMessage()) { return false; - } - if (const auto urls = data->urls(); !urls.empty()) { + } else if (const auto urls = data->urls(); !urls.empty()) { if (ranges::find_if( urls, [](const QUrl &url) { return !url.isLocalFile(); } ) == urls.end()) { return true; } - } - if (data->hasImage()) { - const auto image = qvariant_cast(data->imageData()); - if (!image.isNull()) { - return true; - } + } else if (data->hasImage()) { + return true; } return false; }