From 3325106837d2e2e2fb8db9d782c4336b1cf98f08 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 1 Jan 2018 23:23:18 +0300 Subject: [PATCH] Add some debug information for crashes. --- Telegram/SourceFiles/history/history_item.cpp | 2 ++ Telegram/SourceFiles/mediaview.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index 92fe1842e..ede83f1f0 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -356,7 +356,9 @@ Storage::SharedMediaTypesMask HistoryItem::sharedMediaTypes() const { void HistoryItem::indexAsNewItem() { if (IsServerMsgId(id)) { + CrashReports::SetAnnotation("addToUnreadMentions", QString::number(id)); addToUnreadMentions(UnreadMentionType::New); + CrashReports::ClearAnnotation("addToUnreadMentions"); if (const auto types = sharedMediaTypes()) { Auth().storage().add(Storage::SharedMediaAddNew( history()->peer->id, diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp index 7e3ee86f8..8247ff530 100644 --- a/Telegram/SourceFiles/mediaview.cpp +++ b/Telegram/SourceFiles/mediaview.cpp @@ -3028,12 +3028,18 @@ void MediaView::findCurrent() { ? (_index | func::add(*_sharedMediaData->skippedBefore())) : base::none; _fullCount = _sharedMediaData->fullCount(); + if (_index) { + Assert(*_index >= 0 && *_index < _sharedMediaData->size()); + } } else if (_userPhotosData) { _index = _photo ? _userPhotosData->indexOf(_photo->id) : base::none; _fullIndex = _userPhotosData->skippedBefore() ? (_index | func::add(*_userPhotosData->skippedBefore())) : base::none; _fullCount = _userPhotosData->fullCount(); + if (_index) { + Assert(*_index >= 0 && *_index < _userPhotosData->size()); + } } else { _index = _fullIndex = _fullCount = base::none; }