RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/johnprestonmail/telegram-desktop

This commit is contained in:
John Preston 2016-09-23 19:42:55 +03:00
parent 3e4088b413 0479b214da
commit efbf67a8ff
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/history.cpp
View File

@ -8145,7 +8145,13 @@ bool HistoryService::prepareGameScoreText(const QString &from, QString *outText,
second = MakeShared<ReplyMarkupClickHandler>(item, i, j);
auto parts = strData.split(',');
t_assert(parts.size() > 2);
return textcmdLink(2, parts.mid(2).join(','));
QString gameTitle;
gameTitle.reserve(strData.size() - 2);
gameTitle.append(parts[2]);
for (int i = 3, count = parts.size(); i != count; ++i) {
gameTitle.append(',').append(parts[i]);
}
return textcmdLink(2, gameTitle);
}
}
}

2
Telegram/SourceFiles/stickers/emoji_pan.cpp
View File

@ -2158,7 +2158,7 @@ void StickerPanInner::updateSelected() {
}
for (int c = 0, l = sets.size(); c < l; ++c) {
auto &set = sets[c];
bool special = featured ? false : (set.flags & MTPDstickerSet::Flag::f_official);
bool special = featured ? false : bool(set.flags & MTPDstickerSet::Flag::f_official);
y = ytill;
if (featured) {