From 3fe9c36d90fbbddefd3c0fdfd5d2f9e412e38ba9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 8 Jun 2020 13:21:44 +0300
Subject: [PATCH] Added Esc shortcut to cancel edit in section of scheduled
 messages.

---
 .../history/view/history_view_scheduled_section.cpp         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index cf852496a..ea53f2fea 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -168,7 +168,7 @@ void ScheduledWidget::setupComposeControls() {
 
 	_composeControls->cancelRequests(
 	) | rpl::start_with_next([=] {
-		controller()->showBackFromStack();
+		listCancelRequest();
 	}, lifetime());
 
 	_composeControls->sendRequests(
@@ -1037,6 +1037,10 @@ void ScheduledWidget::listCancelRequest() {
 		clearSelected();
 		return;
 	}
+	if (_composeControls->isEditingMessage()) {
+		_composeControls->cancelEditMessage();
+		return;
+	}
 	controller()->showBackFromStack();
 }