From 59c03bb52115a8a4d317b4470ca8471296551290 Mon Sep 17 00:00:00 2001
From: RadRussianRus <radrussianrus@gmail.com>
Date: Tue, 22 Oct 2019 11:56:37 +0300
Subject: [PATCH] Reworking hashtag fix

---
 Telegram/SourceFiles/facades.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp
index 7f1a9505b..211899f89 100644
--- a/Telegram/SourceFiles/facades.cpp
+++ b/Telegram/SourceFiles/facades.cpp
@@ -151,15 +151,15 @@ void searchByHashtag(const QString &tag, PeerData *inPeer) {
 				controller->closeFolder();
 			}
 		}
-	}
-	if (const auto m = App::main()) {
 		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());
+		}
 	}
 }