From fc47aa0da9b614befab329698c4bff51a9351684 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Aug 2023 10:51:10 +0200
Subject: [PATCH] Fix scheduled media editing.

---
 Telegram/SourceFiles/history/history_item.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

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