From 7c535a988872eb2ff162cabec673cd297d66e4bc Mon Sep 17 00:00:00 2001 From: blank X Date: Wed, 29 Sep 2021 13:26:53 +0000 Subject: [PATCH] Fix unquoted and uncaptioned being swapped (#232) --- Telegram/SourceFiles/apiwrap.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index e916f6e5d..d955f46fc 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -3949,9 +3949,9 @@ void ApiWrap::forwardMessagesUnquoted( const auto inputMedia = media->photo() ? MTP_inputMediaPhoto(MTP_flags(0), media->photo()->mtpInput(), MTPint()) : MTP_inputMediaDocument(MTP_flags(0), media->document()->mtpInput(), MTPint(), MTPstring()); - auto caption = (draft.options == Data::ForwardOptions::NoNamesAndCaptions) - ? TextWithEntities() - : item->originalText(); + auto caption = (draft.options != Data::ForwardOptions::NoNamesAndCaptions) + ? item->originalText() + : TextWithEntities(); auto sentEntities = Api::EntitiesToMTP( _session, caption.entities, @@ -4089,7 +4089,7 @@ void ApiWrap::forwardMessagesUnquoted( const auto media = item->media(); auto message = ApiWrap::MessageToSend(history); - const auto caption = (draft.options == Data::ForwardOptions::NoNamesAndCaptions + const auto caption = (draft.options != Data::ForwardOptions::NoNamesAndCaptions && !media->geoPoint() && !media->sharedContact()) ? item->originalText()