tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not warn on animated sticker size changes.

Browse Source 
GitOrigin-RevId: 256c201cb91e2ee99f23abd2464cc586a27d66c5
This commit is contained in:
levlam 2020-03-24 00:36:22 +03:00
parent 76558f0802
commit c5b7a92e78
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
td/telegram/StickersManager.cpp
View File

@ -1518,7 +1518,8 @@ bool StickersManager::merge_stickers(FileId new_id, FileId old_id, bool can_dele
CHECK(new_ != nullptr); CHECK(new_ != nullptr);
if (old_->alt != new_->alt || old_->set_id != new_->set_id || 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 LOG(ERROR) << "Sticker has changed: alt = (" << old_->alt << ", " << new_->alt << "), set_id = (" << old_->set_id
<< ", " << new_->set_id << "), dimensions = (" << old_->dimensions << ", " << new_->dimensions << ")"; << ", " << new_->set_id << "), dimensions = (" << old_->dimensions << ", " << new_->dimensions << ")";
} }