From 01821c30e51d9340a29cfef70966c7bba309a26c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Dec 2017 16:18:00 +0300
Subject: [PATCH] Fix message field focus loss in Saved Messages.

---
 Telegram/SourceFiles/info/info_content_widget.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index 1817e528f..7b191a666 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -66,6 +66,7 @@ ContentWidget::ContentWidget(
 			_controller->wrapValue(),
 			_controller->searchEnabledByContent(),
 			(_1 == Wrap::Layer) && _2
+		) | rpl::distinct_until_changed(
 		) | rpl::start_with_next([this](bool shown) {
 			refreshSearchField(shown);
 		}, lifetime());
@@ -257,7 +258,9 @@ void ContentWidget::refreshSearchField(bool shown) {
 		_searchField->setFocus();
 		setScrollTopSkip(view->heightNoMargins() - st::lineWidth);
 	} else {
-		setFocus();
+		if (Ui::InFocusChain(this)) {
+			setFocus();
+		}
 		_searchWrap = nullptr;
 		setScrollTopSkip(0);
 	}