From 21232e09a486b5c2ae9bc8bb3f4b53ec9ac3101c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 9 Jan 2023 09:36:20 +0400
Subject: [PATCH] Fix a crash in topic from archive search.

Fixes #25609.
---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 1 -
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp       | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 10a6e6936..a713fea52 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -2851,7 +2851,6 @@ void InnerWidget::searchInChat(Key key, PeerData *from) {
 	_searchInChat = key;
 	_searchFromPeer = from;
 	if (_searchInChat) {
-		_controller->closeFolder();
 		onHashtagFilterUpdate(QStringView());
 		_cancelSearchInChat->show();
 	} else {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 2f1be2d1b..4a5866a1b 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2196,6 +2196,9 @@ bool Widget::setSearchInChat(Key chat, PeerData *from) {
 		updateSearchFromVisibility();
 		clearSearchCache();
 	}
+	if (_searchInChat && _layout == Layout::Main) {
+		controller()->closeFolder();
+	}
 	_inner->searchInChat(_searchInChat, _searchFromAuthor);
 	if (_subsectionTopBar) {
 		_subsectionTopBar->searchEnableJumpToDate(