From 5fe75fbd5f818f0f2f17e5b330ff3f69afa81ec2 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 12 May 2017 17:05:06 +0300 Subject: [PATCH] Attempt to fix an assertion violation. In some cases HistoryItem::attachToBlock was not calling History::setHasPendingResizedItems (if it was not pending resize). That could lead to addition of a whole block of items without setting pending resize for the history and it violated the history invariant of the _blocks y/height and their _items y/height. Now each time we attachToBlock an item we also setPendingResize it. --- Telegram/SourceFiles/history/history_item.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h index 937faf0c1..f31a2d21d 100644 --- a/Telegram/SourceFiles/history/history_item.h +++ b/Telegram/SourceFiles/history/history_item.h @@ -529,9 +529,7 @@ public: _block = block; _indexInBlock = index; - if (pendingResize()) { - _history->setHasPendingResizedItems(); - } + setPendingResize(); } void setIndexInBlock(int index) { Expects(_block != nullptr); @@ -540,13 +538,9 @@ public: _indexInBlock = index; } int indexInBlock() const { - if (_indexInBlock >= 0) { - t_assert(_block != nullptr); - t_assert(_block->items.at(_indexInBlock) == this); - } else if (_block != nullptr) { - t_assert(_indexInBlock >= 0); - t_assert(_block->items.at(_indexInBlock) == this); - } + Expects((_indexInBlock >= 0) == (_block != nullptr)); + Expects((_block == nullptr) || (_block->items[_indexInBlock] == this)); + return _indexInBlock; } bool out() const {