From 364aaaae5bfaaad5d90c3ed421b48ce3fac08e4a Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 3 Jun 2018 20:58:28 +0300 Subject: [PATCH] Fix recent stickers icon. Fixes #4780. --- Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index 94cb5950e..f8eb44036 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -268,7 +268,9 @@ void StickersListWidget::Footer::validateSelectedIcon( ValidateIconAnimations animations) { auto newSelected = 0; for (auto i = 0, l = _icons.size(); i != l; ++i) { - if (_icons[i].setId == setId) { + if (_icons[i].setId == setId + || (_icons[i].setId == Stickers::FavedSetId + && setId == Stickers::RecentSetId)) { newSelected = i; break; } @@ -2009,7 +2011,7 @@ void StickersListWidget::fillIcons(QList &icons) { } if (i != _mySets.size() && _mySets[i].id == Stickers::RecentSetId) { ++i; - if (!icons.empty() && icons.back().setId != Stickers::FavedSetId) { + if (icons.empty() || icons.back().setId != Stickers::FavedSetId) { icons.push_back(StickerIcon(Stickers::RecentSetId)); } }