From f7e4f18e9ba5e56ff552645b2d55a57f07c1079f Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 25 Sep 2020 15:31:53 +0300 Subject: [PATCH] Fix a crash in failed-sent scheduled messages. --- .../history/view/history_view_context_menu.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp index 86053fcb4f..7e38780def 100644 --- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp +++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp @@ -79,6 +79,7 @@ bool HasEditMessageAction(const ContextMenuRequest &request) { const auto item = request.item; if (!item || item->isSending() + || item->hasFailed() || item->isEditingMedia() || !request.selectedItems.empty()) { return false; @@ -627,9 +628,10 @@ bool AddSelectMessageAction( if (request.overSelection && !request.selectedItems.empty()) { return false; } else if (!item - || item->isSending() - || !IsServerMsgId(ItemIdAcrossData(item)) - || item->serviceMsg()) { + || item->isSending() + || item->hasFailed() + || !IsServerMsgId(ItemIdAcrossData(item)) + || item->serviceMsg()) { return false; } const auto owner = &item->history()->owner();