mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 22:55:11 +00:00
Code Issues Releases Wiki Activity

Fix cancel / crash in sending album to scheduled messages.

Browse Source 
Fixes #8788
This commit is contained in:
John Preston
2020-10-22 16:08:01 +03:00
parent b788ae0ae4
commit 1cabfaa6a4
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/history/history.cpp
View File

@@ -416,11 +416,12 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
types, types,
item->id)); item->id));
} }
} else {
session().api().cancelLocalItem(item);
} }
itemRemoved(item); itemRemoved(item);
} }
if (item->isSending()) {
session().api().cancelLocalItem(item);
}
owner().unregisterMessage(item); owner().unregisterMessage(item);
Core::App().notifications().clearFromItem(item); Core::App().notifications().clearFromItem(item);

2
Telegram/SourceFiles/history/view/history_view_context_menu.cpp
View File

@@ -69,7 +69,7 @@ constexpr auto kExportLocalTimeout = crl::time(1000);
//} //}
MsgId ItemIdAcrossData(not_null<HistoryItem*> item) { MsgId ItemIdAcrossData(not_null<HistoryItem*> item) {
if (!item->isScheduled()) { if (!item->isScheduled() || item->isSending() || item->hasFailed()) {
return item->id; return item->id;
} }
const auto session = &item->history()->session(); const auto session = &item->history()->session();