Fix recent stickers icon.

Fixes #4780.
This commit is contained in:
John Preston 2018-06-03 20:58:28 +03:00
parent 2bd8737410
commit 364aaaae5b

View file

@ -268,7 +268,9 @@ void StickersListWidget::Footer::validateSelectedIcon(
ValidateIconAnimations animations) { ValidateIconAnimations animations) {
auto newSelected = 0; auto newSelected = 0;
for (auto i = 0, l = _icons.size(); i != l; ++i) { 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; newSelected = i;
break; break;
} }
@ -2009,7 +2011,7 @@ void StickersListWidget::fillIcons(QList<StickerIcon> &icons) {
} }
if (i != _mySets.size() && _mySets[i].id == Stickers::RecentSetId) { if (i != _mySets.size() && _mySets[i].id == Stickers::RecentSetId) {
++i; ++i;
if (!icons.empty() && icons.back().setId != Stickers::FavedSetId) { if (icons.empty() || icons.back().setId != Stickers::FavedSetId) {
icons.push_back(StickerIcon(Stickers::RecentSetId)); icons.push_back(StickerIcon(Stickers::RecentSetId));
} }
} }