void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into docs

Browse source
This commit is contained in:
John Preston 2015-12-23 16:40:47 +03:00
commit dc72800a5e
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Telegram/SourceFiles/history.cpp
View file

@ -1911,12 +1911,7 @@ void History::addOlderSlice(const QVector<MTPMessage> &slice, const QVector<MTPM
while (till && prev && till->type() == HistoryItemGroup && prev->type() == HistoryItemGroup) { while (till && prev && till->type() == HistoryItemGroup && prev->type() == HistoryItemGroup) {
static_cast<HistoryGroup*>(prev)->uniteWith(static_cast<HistoryGroup*>(till)); static_cast<HistoryGroup*>(prev)->uniteWith(static_cast<HistoryGroup*>(till));
till->detach(); till->destroy();
delete till;
if (blocks.front()->items.isEmpty()) {
delete blocks.front();
blocks.pop_front();
}
till = blocks.isEmpty() ? 0 : blocks.front()->items.front(); till = blocks.isEmpty() ? 0 : blocks.front()->items.front();
} }
if (till && prev && prev->date.date() != till->date.date()) { if (till && prev && prev->date.date() != till->date.date()) {

BIN
Telegram/Telegram.rc
View file

Binary file not shown.

BIN
Telegram/Updater.rc
View file

Binary file not shown.