void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-07 07:33:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash in editing a deleted message.

Browse source 
Regression was introduced in b02b690747.
This commit is contained in:
John Preston 2020-08-17 10:59:19 +04:00
parent fe97939abf
commit 0e1f59a0ed
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -2994,8 +2994,17 @@ void HistoryWidget::showNextUnreadMention() {
} }
void HistoryWidget::saveEditMsg() { void HistoryWidget::saveEditMsg() {
if (_saveEditMsgRequestId) return; Expects(_history != nullptr);
if (_saveEditMsgRequestId) {
return;
}
const auto item = session().data().message(_channel, _editMsgId);
if (!item) {
cancelEdit();
return;
}
const auto webPageId = _previewCancelled const auto webPageId = _previewCancelled
? CancelledWebPageId ? CancelledWebPageId
: ((_previewData && _previewData->pendingTill >= 0) : ((_previewData && _previewData->pendingTill >= 0)
@ -3012,15 +3021,9 @@ void HistoryWidget::saveEditMsg() {
TextUtilities::ConvertTextTagsToEntities(textWithTags.tags) }; TextUtilities::ConvertTextTagsToEntities(textWithTags.tags) };
TextUtilities::PrepareForSending(left, prepareFlags); TextUtilities::PrepareForSending(left, prepareFlags);
const auto item = session().data().message(_channel, _editMsgId);
if (!TextUtilities::CutPart(sending, left, MaxMessageSize)) { if (!TextUtilities::CutPart(sending, left, MaxMessageSize)) {
if (item) {
const auto suggestModerateActions = false; const auto suggestModerateActions = false;
Ui::show(Box<DeleteMessagesBox>(item, suggestModerateActions)); Ui::show(Box<DeleteMessagesBox>(item, suggestModerateActions));
} else {
_field->selectAll();
_field->setFocus();
}
return; return;
} else if (!left.text.isEmpty()) { } else if (!left.text.isEmpty()) {
Ui::show(Box<InformBox>(tr::lng_edit_too_long(tr::now))); Ui::show(Box<InformBox>(tr::lng_edit_too_long(tr::now)));
@ -5750,7 +5753,9 @@ int HistoryWidget::countMembersDropdownHeightMax() const {
} }
void HistoryWidget::cancelEdit() { void HistoryWidget::cancelEdit() {
if (!_editMsgId) return; if (!_editMsgId) {
return;
}
_replyEditMsg = nullptr; _replyEditMsg = nullptr;
_editMsgId = 0; _editMsgId = 0;