From 29d93d348c1810c1dce78a8e80e7038ce112cecf Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 14 Feb 2023 10:00:10 +0400 Subject: [PATCH] Fix possible crash in migration tracking. --- .../SourceFiles/history/history_inner_widget.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index 90dd68bc60..121b3084f7 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -3946,8 +3946,17 @@ void HistoryInner::notifyIsBotChanged() { } void HistoryInner::notifyMigrateUpdated() { - _migrated = _history->migrateFrom(); - _migrated->translateTo(_history->translatedTo()); + const auto migrated = _history->migrateFrom(); + if (_migrated != migrated) { + if (_migrated) { + _migrated->delegateMixin()->setCurrent(nullptr); + } + _migrated = migrated; + if (_migrated) { + _migrated->delegateMixin()->setCurrent(this); + _migrated->translateTo(_history->translatedTo()); + } + } } void HistoryInner::applyDragSelection() {