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

Don't warn if sticker's emoji changes.

Browse Source
This commit is contained in:
levlam 2023-11-09 02:15:35 +03:00
parent a538581a4b
commit 9184b3e62d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
td/telegram/StickersManager.cpp
View File

@ -3175,10 +3175,9 @@ void StickersManager::merge_stickers(FileId new_id, FileId old_id) {
if (new_ == nullptr) {
dup_sticker(new_id, old_id);
} else {
if (old_->set_id_ == new_->set_id_ &&
(old_->alt_ != new_->alt_ || old_->set_id_ != new_->set_id_ ||
(!is_sticker_format_vector(old_->format_) && !is_sticker_format_vector(new_->format_) &&
old_->dimensions_.width != 0 && old_->dimensions_.height != 0 && old_->dimensions_ != new_->dimensions_))) {
if (old_->set_id_ == new_->set_id_ && old_->dimensions_ != new_->dimensions_ && old_->dimensions_.width != 0 &&
old_->dimensions_.height != 0 && !is_sticker_format_vector(old_->format_) &&
!is_sticker_format_vector(new_->format_)) {
LOG(ERROR) << "Sticker has changed: alt = (" << old_->alt_ << ", " << new_->alt_ << "), set_id = ("
<< old_->set_id_ << ", " << new_->set_id_ << "), dimensions = (" << old_->dimensions_ << ", "
<< new_->dimensions_ << ")";