From eec59611ef7b5acde4a5c07746496341655073a0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 17 Aug 2024 17:09:28 +0200
Subject: [PATCH] Fix leaving forum glitch.
---
Telegram/SourceFiles/data/data_session.cpp | 27 ++++++++++++++--------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 8016381b2..ed31b1683 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -1271,24 +1271,31 @@ History *Session::historyLoaded(const PeerData *peer) {
}
void Session::deleteConversationLocally(not_null<PeerData*> peer) {
- const auto history = historyLoaded(peer);
- if (history) {
+ const auto markLeft = [&] {
+ if (const auto channel = peer->asMegagroup()) {
+ channel->addFlags(ChannelDataFlag::Left);
+ if (const auto from = channel->getMigrateFromChat()) {
+ if (const auto migrated = historyLoaded(from)) {
+ migrated->updateChatListExistence();
+ }
+ }
+ }
+ };
+ if (const auto history = historyLoaded(peer)) {
if (history->folderKnown()) {
setChatPinned(history, FilterId(), false);
}
removeChatListEntry(history);
history->clearFolder();
+
+ // We want to mark the channel as left before unloading the history,
+ // otherwise some parts of updating may return us to the chats list.
+ markLeft();
history->clear(peer->isChannel()
? History::ClearType::Unload
: History::ClearType::DeleteChat);
- }
- if (const auto channel = peer->asMegagroup()) {
- channel->addFlags(ChannelDataFlag::Left);
- if (const auto from = channel->getMigrateFromChat()) {
- if (const auto migrated = historyLoaded(from)) {
- migrated->updateChatListExistence();
- }
- }
+ } else {
+ markLeft();
}
}