Skip to content

Commit

Permalink
fixed crash in groups uniting
Browse files Browse the repository at this point in the history
  • Loading branch information
john-preston committed Dec 10, 2015
1 parent c0e7019 commit 22aef52
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions Telegram/SourceFiles/history.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1987,12 +1987,7 @@ void History::addOlderSlice(const QVector<MTPMessage> &slice, const QVector<MTPM

while (till && prev && till->type() == HistoryItemGroup && prev->type() == HistoryItemGroup) {
static_cast<HistoryGroup*>(prev)->uniteWith(static_cast<HistoryGroup*>(till));
till->detach();
delete till;
if (blocks.front()->items.isEmpty()) {
delete blocks.front();
blocks.pop_front();
}
till->destroy();
till = blocks.isEmpty() ? 0 : blocks.front()->items.front();
}
if (till && prev && prev->date.date() != till->date.date()) {
Expand Down

0 comments on commit 22aef52

Please sign in to comment.