From c65004efde65532ca6044bf892e9b511e9489ba1 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 29 Nov 2019 15:30:48 +0300
Subject: [PATCH] Padd Message pointer to cancel_send_message_query.

GitOrigin-RevId: 2e56372571b970d8549f5a8b9223218f1ffa9244
---
 td/telegram/MessagesManager.cpp | 9 +++++----
 td/telegram/MessagesManager.h   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index bf5e823ac..54bfb5b46 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -12240,7 +12240,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_message(Dialog *
 
   if (!only_from_memory) {
     if (message_id.is_yet_unsent()) {
-      cancel_send_message_query(d->dialog_id, result);
+      cancel_send_message_query(d->dialog_id, result.get());
     } else {
       cancel_edit_message_media(d->dialog_id, result.get(), "Message was deleted");
     }
@@ -12293,6 +12293,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_message(Dialog *
 }
 
 void MessagesManager::on_message_deleted(Dialog *d, Message *m, const char *source) {
+  // also called for unloaded messages
   CHECK(m->message_id.is_valid());
   switch (d->dialog_id.get_type()) {
     case DialogType::User:
@@ -12349,7 +12350,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_scheduled_messag
   // TODO delete the message
   /*
   if (message_id.is_yet_unsent()) {
-    cancel_send_message_query(d->dialog_id, result);
+    cancel_send_message_query(d->dialog_id, result.get());
   } else {
     cancel_edit_message_media(d->dialog_id, result.get(), "Message was deleted");
   }
@@ -12379,7 +12380,7 @@ void MessagesManager::do_delete_all_dialog_messages(Dialog *d, unique_ptr<Messag
   remove_message_file_sources(d->dialog_id, m.get());
 
   if (message_id.is_yet_unsent()) {
-    cancel_send_message_query(d->dialog_id, m);
+    cancel_send_message_query(d->dialog_id, m.get());
   } else {
     cancel_edit_message_media(d->dialog_id, m.get(), "Message was deleted");
   }
@@ -17163,7 +17164,7 @@ void MessagesManager::cancel_upload_file(FileId file_id) {
   send_closure_later(G()->file_manager(), &FileManager::cancel_upload, file_id);
 }
 
-void MessagesManager::cancel_send_message_query(DialogId dialog_id, unique_ptr<Message> &m) {
+void MessagesManager::cancel_send_message_query(DialogId dialog_id, Message *m) {
   CHECK(m != nullptr);
   CHECK(m->content != nullptr);
   CHECK(m->message_id.is_yet_unsent());
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 9bfbe7840..98e0baa5f 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -2047,7 +2047,7 @@ class MessagesManager : public Actor {
 
   static void cancel_upload_file(FileId file_id);
 
-  void cancel_send_message_query(DialogId dialog_id, unique_ptr<Message> &m);
+  void cancel_send_message_query(DialogId dialog_id, Message *m);
 
   static int32 get_message_flags(const Message *m);