From c6cdf0a4c4b4b7b8df5a682d9c2f4d2557757a26 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Fri, 4 Mar 2022 18:53:32 +0300 Subject: [PATCH] Fixed ability to send file to photo/video album from EditCaptionBox. --- Telegram/SourceFiles/boxes/edit_caption_box.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp index 506439024e..0d7319339c 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp @@ -410,9 +410,14 @@ void EditCaptionBox::setupPhotoEditorEventHandler() { controller->session().settings().incrementPhotoEditorHintShown(); controller->session().saveSettings(); }; + const auto clearError = [=] { + _error = QString(); + update(); + }; const auto previewWidth = st::sendMediaPreviewSize; if (!_preparedList.files.empty()) { increment(); + clearError(); Editor::OpenWithPreparedFile( this, controller, @@ -425,6 +430,7 @@ void EditCaptionBox::setupPhotoEditorEventHandler() { return; } increment(); + clearError(); auto callback = [=](const Editor::PhotoModifications &mods) { if (!mods || !_photoMedia) { return; @@ -687,6 +693,13 @@ void EditCaptionBox::save() { options.scheduled = item->isScheduled() ? item->date() : 0; if (!_preparedList.files.empty()) { + if ((_albumType != Ui::AlbumType::None) + && !_preparedList.files.front().canBeInAlbumType( + _albumType)) { + _error = tr::lng_edit_media_album_error(tr::now); + update(); + return; + } auto action = Api::SendAction(item->history(), options); action.replaceMediaOf = item->fullId().msg;