From 0e77a35b0a465dcc566dcf065b6c20a6815ceda9 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 17 May 2020 17:14:29 +0300 Subject: [PATCH] Warn on changed sticker, only if set_id is still the same. GitOrigin-RevId: 756c3c0ea8b40ce5c96dc72281961f1de9bd2453 --- td/telegram/StickersManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp index a422c2c00..e9163a53d 100644 --- a/td/telegram/StickersManager.cpp +++ b/td/telegram/StickersManager.cpp @@ -1774,9 +1774,9 @@ bool StickersManager::merge_stickers(FileId new_id, FileId old_id, bool can_dele Sticker *new_ = new_it->second.get(); CHECK(new_ != nullptr); - if (old_->alt != new_->alt || old_->set_id != new_->set_id || - (!old_->is_animated && !new_->is_animated && old_->dimensions.width != 0 && old_->dimensions.height != 0 && - old_->dimensions != new_->dimensions)) { + if (old_->set_id == new_->set_id && (old_->alt != new_->alt || old_->set_id != new_->set_id || + (!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 << ")"; }