From c5b7a92e78b93f4dcd34f6657a237920ee0dfeb7 Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 24 Mar 2020 00:36:22 +0300 Subject: [PATCH] Do not warn on animated sticker size changes. GitOrigin-RevId: 256c201cb91e2ee99f23abd2464cc586a27d66c5 --- td/telegram/StickersManager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp index 495b45b0f..f47d32007 100644 --- a/td/telegram/StickersManager.cpp +++ b/td/telegram/StickersManager.cpp @@ -1518,7 +1518,8 @@ bool StickersManager::merge_stickers(FileId new_id, FileId old_id, bool can_dele CHECK(new_ != nullptr); if (old_->alt != new_->alt || old_->set_id != new_->set_id || - (old_->dimensions.width != 0 && old_->dimensions.height != 0 && old_->dimensions != new_->dimensions)) { + (!old_->is_animated && !new_->is_animated && old_->dimensions.width != 0 && old_->dimensions.height != 0 && + old_->dimensions != new_->dimensions)) { LOG(ERROR) << "Sticker has changed: alt = (" << old_->alt << ", " << new_->alt << "), set_id = (" << old_->set_id << ", " << new_->set_id << "), dimensions = (" << old_->dimensions << ", " << new_->dimensions << ")"; }