From 327c9caed75c0cb420fd3a0c87c0316c4e1f615a Mon Sep 17 00:00:00 2001
From: RadRussianRus <radrussianrus@gmail.com>
Date: Sun, 26 Jan 2020 05:48:42 +0300
Subject: [PATCH] Fix opening hashtag when in archive
---
Telegram/SourceFiles/facades.cpp | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp
index 7b088a5b6..a38a0fa73 100644
--- a/Telegram/SourceFiles/facades.cpp
+++ b/Telegram/SourceFiles/facades.cpp
@@ -159,14 +159,21 @@ void activateBotCommand(
}
void searchByHashtag(const QString &tag, PeerData *inPeer) {
- if (const auto m = App::main()) {
+ if (const auto window = App::wnd()) {
+ if (const auto controller = window->sessionController()) {
+ if (controller->openedFolder().current()) {
+ controller->closeFolder();
+ }
+ }
Ui::hideSettingsAndLayer();
Core::App().hideMediaView();
- m->searchMessages(
- tag + ' ',
- (inPeer && !inPeer->isUser())
- ? inPeer->owner().history(inPeer).get()
- : Dialogs::Key());
+ if (const auto m = window->mainWidget()) {
+ m->searchMessages(
+ tag + ' ',
+ (inPeer && !inPeer->isUser())
+ ? inPeer->owner().history(inPeer).get()
+ : Dialogs::Key());
+ }
}
}