Fix scheduled media editing.

This commit is contained in:
John Preston 2023-08-17 10:51:10 +02:00
parent 83eb352747
commit fc47aa0da9

View file

@ -1472,6 +1472,7 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
if (!_savedLocalEditMediaData && edition.savePreviousMedia) { if (!_savedLocalEditMediaData && edition.savePreviousMedia) {
savePreviousMedia(); savePreviousMedia();
} }
Assert(!updatingSavedLocalEdit || !isLocalUpdateMedia());
if (edition.isEditHide) { if (edition.isEditHide) {
_flags |= MessageFlag::HideEdited; _flags |= MessageFlag::HideEdited;
@ -1491,15 +1492,13 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
if (!edition.useSameMarkup) { if (!edition.useSameMarkup) {
setReplyMarkup(base::take(edition.replyMarkup)); setReplyMarkup(base::take(edition.replyMarkup));
} }
if (!isLocalUpdateMedia()) { if (updatingSavedLocalEdit) {
if (updatingSavedLocalEdit) { _savedLocalEditMediaData->media = edition.mtpMedia
_savedLocalEditMediaData->media = edition.mtpMedia ? CreateMedia(this, *edition.mtpMedia)
? CreateMedia(this, *edition.mtpMedia) : nullptr;
: nullptr; } else {
} else { removeFromSharedMediaIndex();
removeFromSharedMediaIndex(); refreshMedia(edition.mtpMedia);
refreshMedia(edition.mtpMedia);
}
} }
if (!edition.useSameReactions) { if (!edition.useSameReactions) {
updateReactions(edition.mtpReactions); updateReactions(edition.mtpReactions);
@ -1520,8 +1519,6 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
_savedLocalEditMediaData->text = std::move(updatedText); _savedLocalEditMediaData->text = std::move(updatedText);
} else { } else {
setText(std::move(updatedText)); setText(std::move(updatedText));
}
if (!isLocalUpdateMedia() && !updatingSavedLocalEdit) {
addToSharedMediaIndex(); addToSharedMediaIndex();
} }
if (!edition.useSameReplies) { if (!edition.useSameReplies) {