procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed crash in new sticker icons

This commit is contained in:
John Preston 2015-06-05 18:55:46 +03:00
parent 95e5b7be0b
commit 01410e5d92
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/dropdown.cpp
View File

@ -1498,6 +1498,8 @@ void StickerPanInner::refreshRecent(bool performResize) {
void StickerPanInner::fillIcons(QVector<StickerIcon> &icons) { void StickerPanInner::fillIcons(QVector<StickerIcon> &icons) {
icons.clear(); icons.clear();
if (_setIds.isEmpty()) return;
icons.reserve(_sets.size()); icons.reserve(_sets.size());
int32 i = 0; int32 i = 0;
if (_setIds.at(0) == RecentStickerSetId) ++i; if (_setIds.at(0) == RecentStickerSetId) ++i;
@ -1774,6 +1776,7 @@ void EmojiPan::paintEvent(QPaintEvent *e) {
x -= _iconsX % int(st::rbEmoji.width); x -= _iconsX % int(st::rbEmoji.width);
for (int32 l = qMin(_icons.size(), i + 8 + (_icons.at(0).sticker ? 1 : 0)); i < l; ++i) { for (int32 l = qMin(_icons.size(), i + 8 + (_icons.at(0).sticker ? 1 : 0)); i < l; ++i) {
const StickerIcon &s(_icons.at(i)); const StickerIcon &s(_icons.at(i));
s.sticker->thumb->load();
QPixmap pix(s.sticker->thumb->pix(s.pixw, s.pixh)); QPixmap pix(s.sticker->thumb->pix(s.pixw, s.pixh));
if (_iconSel == i) { if (_iconSel == i) {
p.fillRect(rtl() ? (width() - x - st::rbEmoji.width) : x, _iconsTop, st::rbEmoji.width, st::rbEmoji.height, st::stickerIconSel->b); p.fillRect(rtl() ? (width() - x - st::rbEmoji.width) : x, _iconsTop, st::rbEmoji.width, st::rbEmoji.height, st::stickerIconSel->b);