From 5b7059dccdb59de3916e9d7a7a96a31f4f26f247 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 30 Nov 2017 12:15:21 +0400 Subject: [PATCH] Fix crash in shared media save state. --- .../SourceFiles/info/media/info_media_list_widget.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp index e72455d736..4a5b6d8869 100644 --- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp +++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp @@ -930,11 +930,13 @@ void ListWidget::markLayoutsStale() { void ListWidget::saveState(not_null memento) { if (_universalAroundId != kDefaultAroundId) { - memento->setAroundId(computeFullId(_universalAroundId)); - memento->setIdsLimit(_idsLimit); auto state = countScrollState(); - memento->setScrollTopItem(computeFullId(state.item)); - memento->setScrollTopShift(state.shift); + if (state.item) { + memento->setAroundId(computeFullId(_universalAroundId)); + memento->setIdsLimit(_idsLimit); + memento->setScrollTopItem(computeFullId(state.item)); + memento->setScrollTopShift(state.shift); + } } }