mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-01 06:55:58 +00:00
Code Issues Releases Wiki Activity

Fix crash in history switching.

Browse Source
This commit is contained in:
John Preston
2022-01-05 14:13:37 +03:00
parent 8788692fb3
commit 43559fb6b7
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/SourceFiles/history/history_widget.cpp
View File

@@ -491,7 +491,10 @@ HistoryWidget::HistoryWidget(
session().data().viewResizeRequest( session().data().viewResizeRequest(
) | rpl::start_with_next([=](not_null<HistoryView::Element*> view) { ) | rpl::start_with_next([=](not_null<HistoryView::Element*> view) {
if (view->data()->mainView() == view) { const auto item = view->data();
const auto history = item->history();
if (item->mainView() == view
&& (history == _history || history == _migrated)) {
updateHistoryGeometry(); updateHistoryGeometry();
} }
}, lifetime()); }, lifetime());
@@ -2238,6 +2241,9 @@ void HistoryWidget::setHistory(History *history) {
return; return;
} }
const auto wasHistory = base::take(_history);
const auto wasMigrated = base::take(_migrated);
// Unload lottie animations. // Unload lottie animations.
const auto unloadHeavyViewParts = [](History *history) { const auto unloadHeavyViewParts = [](History *history) {
if (history) { if (history) {
@@ -2246,8 +2252,8 @@ void HistoryWidget::setHistory(History *history) {
history->forceFullResize(); history->forceFullResize();
} }
}; };
unloadHeavyViewParts(_history); unloadHeavyViewParts(wasHistory);
unloadHeavyViewParts(_migrated); unloadHeavyViewParts(wasMigrated);
unregisterDraftSources(); unregisterDraftSources();
_history = history; _history = history;