Allow cancel search-in-chat and keep search query.

This commit is contained in:
John Preston 2020-11-09 12:41:59 +03:00
parent 167a73ef1b
commit 091b62bed4

View file

@ -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