From 22f16caa8967e7a48d7734864e69ea23902b03dc Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 6 Jun 2020 16:25:50 +0300
Subject: [PATCH] Fixed multiple attempts to send request to edit message.

---
 .../view/history_view_scheduled_section.cpp     | 17 +++++++++++++----
 .../view/history_view_scheduled_section.h       |  3 ++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 60c60f434..cf852496a 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -176,11 +176,12 @@ void ScheduledWidget::setupComposeControls() {
 		send();
 	}, lifetime());
 
+	const auto saveEditMsgRequestId = lifetime().make_state<mtpRequestId>(0);
 	_composeControls->editRequests(
 	) | rpl::start_with_next([=](auto data) {
 		if (const auto item = session().data().message(data.fullId)) {
 			if (item->isScheduled()) {
-				edit(item, data.options);
+				edit(item, data.options, saveEditMsgRequestId);
 			}
 		}
 	}, lifetime());
@@ -555,8 +556,11 @@ void ScheduledWidget::send(Api::SendOptions options) {
 
 void ScheduledWidget::edit(
 		not_null<HistoryItem*> item,
-		Api::SendOptions options) {
-
+		Api::SendOptions options,
+		mtpRequestId *const saveEditMsgRequestId) {
+	if (*saveEditMsgRequestId) {
+		return;
+	}
 	const auto textWithTags = _composeControls->getTextWithAppliedMarkdown();
 	const auto prepareFlags = Ui::ItemTextOptions(
 		_history,
@@ -579,7 +583,12 @@ void ScheduledWidget::edit(
 		return;
 	}
 
-	const auto saveEditMsgRequestId = lifetime().make_state<mtpRequestId>(0);
+	lifetime().add([=] {
+		if (!*saveEditMsgRequestId) {
+			return;
+		}
+		session().api().request(base::take(*saveEditMsgRequestId)).cancel();
+	});
 
 	const auto done = [=](const MTPUpdates &result, mtpRequestId requestId) {
 		if (requestId == *saveEditMsgRequestId) {
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index ea978fa4f..385d5b7ac 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -143,7 +143,8 @@ private:
 	void send(Api::SendOptions options);
 	void edit(
 		not_null<HistoryItem*> item,
-		Api::SendOptions options);
+		Api::SendOptions options,
+		mtpRequestId *const saveEditMsgRequestId);
 	void highlightSingleNewMessage(const Data::MessagesSlice &slice);
 	void chooseAttach();
 	[[nodiscard]] SendMenuType sendMenuType() const;