From ebe6db3c48f7d2763754e15aba570c508973df64 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 14 Mar 2016 18:28:39 +0300 Subject: [PATCH] crash fixed in migrated message highlight, xcode version fixed in docs --- Telegram/SourceFiles/historywidget.cpp | 4 ++-- doc/building-xcode-old.md | 2 +- doc/building-xcode.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index a8dc52ad8..5ce8f3564 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -1465,7 +1465,7 @@ HistoryItem *HistoryInner::prevItem(HistoryItem *item) { if (blockIndex > 0) { return item->history()->blocks[blockIndex - 1]->items.back(); } - if (item->history() == _history && _migrated && _history->loadedAtTop() && _migrated->loadedAtBottom() && !_migrated->isEmpty()) { + if (item->history() == _history && _migrated && _history->loadedAtTop() && !_migrated->isEmpty() && _migrated->loadedAtBottom()) { return _migrated->blocks.back()->items.back(); } return 0; @@ -6397,7 +6397,7 @@ void HistoryWidget::updateListSize(int32 addToY, bool initial, bool loadedDown, _animActiveStart = getms(); _animActiveTimer.start(AnimationTimerDelta); _activeAnimMsgId = _showAtMsgId; - if (item->isGroupMigrate() && _migrated && _migrated->loadedAtBottom() && _migrated->blocks.back()->items.back()->isGroupMigrate() && _list->historyTop() != _list->historyDrawTop()) { + if (item->isGroupMigrate() && _migrated && !_migrated->isEmpty() && _migrated->loadedAtBottom() && _migrated->blocks.back()->items.back()->isGroupMigrate() && _list->historyTop() != _list->historyDrawTop()) { _activeAnimMsgId = -_migrated->blocks.back()->items.back()->id; } } diff --git a/doc/building-xcode-old.md b/doc/building-xcode-old.md index cef39bc6a..a42f03f1f 100644 --- a/doc/building-xcode-old.md +++ b/doc/building-xcode-old.md @@ -1,4 +1,4 @@ -##Build instructions for Xcode 6.4 +##Build instructions for Xcode 7.2.1 ###Prepare folder diff --git a/doc/building-xcode.md b/doc/building-xcode.md index cdc229f7d..e52069781 100644 --- a/doc/building-xcode.md +++ b/doc/building-xcode.md @@ -1,4 +1,4 @@ -##Build instructions for Xcode 6.4 +##Build instructions for Xcode 7.2.1 ###Prepare folder