From 091b62bed4060fbd2d2e7dd5ef01558c7feda67e Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 9 Nov 2020 12:41:59 +0300 Subject: [PATCH] Allow cancel search-in-chat and keep search query. --- Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index a69b59264f..5e82e23b96 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -1784,7 +1784,9 @@ bool Widget::onCancelSearch() { void Widget::onCancelSearchInChat() { cancelSearchRequest(); if (_searchInChat) { - if (Adaptive::OneColumn() && !controller()->selectingPeer()) { + if (Adaptive::OneColumn() + && !controller()->selectingPeer() + && _filter->getLastText().trimmed().isEmpty()) { if (const auto peer = _searchInChat.peer()) { Ui::showPeerHistory(peer, ShowAtUnreadMsgId); //} else if (const auto feed = _searchInChat.feed()) { // #feed