RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-03-25 04:38:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix sticker sending from clipboard.

Browse Source
This commit is contained in:
John Preston 2019-07-15 14:08:35 +02:00
parent 8477956117
commit f2b3d9714f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/SourceFiles/storage/storage_media_prepare.cpp
View File

@ -27,8 +27,12 @@ bool HasExtensionFrom(const QString &file, const QStringList &extensions) {
return false;
}
bool ValidPhotoForAlbum(const FileMediaInformation::Image &image) {
if (image.animated) {
bool ValidPhotoForAlbum(
const FileMediaInformation::Image &image,
const QString &mime) {
if (image.animated
|| mime == qstr("image/webp")
|| mime == qstr("application/x-tgsticker")) {
return false;
}
const auto width = image.data.width();
@ -79,7 +83,7 @@ bool PrepareAlbumMediaIsWaiting(
using Video = FileMediaInformation::Video;
if (const auto image = base::get_if<Image>(
&file.information->media)) {
if (ValidPhotoForAlbum(*image)) {
if (ValidPhotoForAlbum(*image, file.mime)) {
file.shownDimensions = PrepareShownDimensions(image->data);
file.preview = Images::prepareOpaque(image->data.scaledToWidth(
std::min(previewWidth, ConvertScale(image->data.width()))
@ -313,7 +317,7 @@ void PreparedList::mergeToEnd(PreparedList &&other) {
bool PreparedList::canAddCaption(bool isAlbum, bool compressImages) const {
const auto isSticker = [&] {
if (files.empty() || compressImages) {
if (files.empty()) {
return false;
}
return (files.front().mime == qstr("image/webp"))