mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Preston
2015-07-01 01:59:21 +03:00
parent f7d55005c4 89d68cab3e
commit 61a2a44584
8 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/history.cpp
View File

@@ -3147,6 +3147,9 @@ HistorySticker::HistorySticker(DocumentData *document) : HistoryMedia()
, pixw(1), pixh(1), data(document), lastw(0)
{
data->thumb->load();
if (!data->sticker->alt.isEmpty()) {
_emoji = data->sticker->alt;
}
}
void HistorySticker::initDimensions(const HistoryItem *parent) {