mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 22:46:10 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

Browse Source
This commit is contained in:
John Preston
2015-10-27 23:48:17 -04:00
parent 81f523cd21 63dbf7e9ef
commit 98cad7151d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/history.cpp
View File

@@ -4363,6 +4363,10 @@ HistorySticker::HistorySticker(DocumentData *document) : HistoryMedia()
data->thumb->load();
if (!data->sticker()->alt.isEmpty()) {
_emoji = data->sticker()->alt;
int32 elen = 0;
if (EmojiPtr e = emojiFromText(_emoji.constData(), _emoji.constEnd(), elen)) {
_emoji = emojiString(e);
}
}
}