From becbad32c97c20ad6c2852d39da5aebd13c20cb8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 27 May 2018 12:42:49 +0300
Subject: [PATCH] Hide stickers by emoji when editing message.

---
 Telegram/SourceFiles/history/history_widget.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index b90919f44..50482b26b 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1136,8 +1136,10 @@ void HistoryWidget::updateStickersByEmoji() {
 }
 
 void HistoryWidget::onTextChange() {
-	updateInlineBotQuery();
-	updateStickersByEmoji();
+	InvokeQueued(this, [=] {
+		updateInlineBotQuery();
+		updateStickersByEmoji();
+	});
 
 	if (_history) {
 		if (!_inlineBot
@@ -1634,6 +1636,8 @@ void HistoryWidget::fastShowAtEnd(not_null<History*> history) {
 }
 
 void HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
+	InvokeQueued(this, [=] { updateStickersByEmoji(); });
+
 	auto draft = _history ? _history->draft() : nullptr;
 	auto fieldAvailable = canWriteMessage();
 	if (!draft || (!_history->editDraft() && !fieldAvailable)) {
@@ -6272,10 +6276,13 @@ void HistoryWidget::onCancel() {
 				lang(lng_cancel_edit_post_yes),
 				lang(lng_cancel_edit_post_no),
 				base::lambda_guarded(this, [this] {
-				onFieldBarCancel();
-			})));
+					if (_editMsgId) {
+						cancelEdit();
+						Ui::hideLayer();
+					}
+				})));
 		} else {
-			onFieldBarCancel();
+			cancelEdit();
 		}
 	} else if (!_fieldAutocomplete->isHidden()) {
 		_fieldAutocomplete->hideAnimated();