MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash in drafts saving.

Browse Source 
Regression was introduced in 43559fb6b7.
This commit is contained in:
John Preston 2022-01-18 19:00:59 +03:00
parent bd4f993292
commit ecedce0c2f
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2030,7 +2030,6 @@ void HistoryWidget::showHistory(
_membersDropdown.destroy();
_scrollToAnimation.stop();
clearAllLoadRequests();
setHistory(nullptr);
_list = nullptr;
_peer = nullptr;
@ -2241,10 +2240,6 @@ void HistoryWidget::setHistory(History *history) {
return;
}
const auto wasHistory = base::take(_history);
const auto wasMigrated = base::take(_migrated);
// Unload lottie animations.
const auto unloadHeavyViewParts = [](History *history) {
if (history) {
history->owner().unloadHeavyViewParts(
@ -2252,13 +2247,19 @@ void HistoryWidget::setHistory(History *history) {
history->forceFullResize();
}
};
unloadHeavyViewParts(wasHistory);
unloadHeavyViewParts(wasMigrated);
unregisterDraftSources();
_history = history;
_migrated = _history ? _history->migrateFrom() : nullptr;
registerDraftSource();
if (_history) {
unregisterDraftSources();
clearAllLoadRequests();
const auto wasHistory = base::take(_history);
const auto wasMigrated = base::take(_migrated);
unloadHeavyViewParts(wasHistory);
unloadHeavyViewParts(wasMigrated);
}
if (history) {
_history = history;
_migrated = _history ? _history->migrateFrom() : nullptr;
registerDraftSource();
}
}
void HistoryWidget::unregisterDraftSources() {
@ -7412,6 +7413,7 @@ HistoryWidget::~HistoryWidget() {
session().api().saveDraftToCloudDelayed(_history);
clearAllLoadRequests();
setHistory(nullptr);
unregisterDraftSources();
}
setTabbedPanel(nullptr);