crash fixed in migrated message highlight, xcode version fixed in docs

This commit is contained in:
John Preston 2016-03-14 18:28:39 +03:00
parent 3e37be5d5c
commit ebe6db3c48
3 changed files with 4 additions and 4 deletions

View File

@ -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;
}
}

View File

@ -1,4 +1,4 @@
##Build instructions for Xcode 6.4
##Build instructions for Xcode 7.2.1
###Prepare folder

View File

@ -1,4 +1,4 @@
##Build instructions for Xcode 6.4
##Build instructions for Xcode 7.2.1
###Prepare folder