diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp index a2e3f21ed..8ba397094 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp +++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp @@ -152,25 +152,6 @@ bool PreparedList::canAddCaption(bool sendingAlbum) const { } else if (!sendingAlbum) { return false; } - - // All music. - { - auto pred = [](const PreparedFile &file) { - return file.type == PreparedFile::Type::Music; - }; - if (ranges::all_of(files, std::move(pred))) { - return true; - } - } - // All files. - { - auto pred = [](const PreparedFile &file) { - return file.type == PreparedFile::Type::File; - }; - if (ranges::all_of(files, std::move(pred))) { - return true; - } - } const auto hasFiles = ranges::contains( files, PreparedFile::Type::File, diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h index 3f9ad0453..fe7d5251d 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h +++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h @@ -120,7 +120,7 @@ struct PreparedGroup { [[nodiscard]] bool sentWithCaption() const { return (list.files.size() == 1) - || (type != AlbumType::None); + || (type == AlbumType::PhotoVideo); } };