diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 33dda64bf4..edbf31f2aa 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -164,6 +164,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_edit_media" = "Edit media"; "lng_edit_media_album_error" = "This file cannot be saved as a part of an album."; +"lng_edit_media_invalid_file" = "Sorry, no way to use this file."; "lng_intro_about" = "Welcome to the official Telegram Desktop app.\nIt's fast and secure."; "lng_start_msgs" = "START MESSAGING"; diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index dea362d2c9..bc0a63a9e8 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -4678,10 +4678,15 @@ void ApiWrap::editUploadedFile( applyUpdates(result); }).fail([=](const RPCError &error) { QString err = error.type(); - if (err == qstr("MESSAGE_NOT_MODIFIED") - || err == qstr("MEDIA_NEW_INVALID")) { + if (err == qstr("MESSAGE_NOT_MODIFIED")) { item->returnSavedMedia(); _session->data().sendHistoryChangeNotifications(); + } else if (err == qstr("MEDIA_NEW_INVALID")) { + item->returnSavedMedia(); + _session->data().sendHistoryChangeNotifications(); + Ui::show( + Box(lang(lng_edit_media_invalid_file)), + LayerOption::KeepOther); } else { sendMessageFail(error); } diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp index 4d73182c21..0cab597a8b 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp @@ -405,7 +405,7 @@ void EditCaptionBox::createEditMediaButton() { const auto isWebp = [](QString mimeType) { if (mimeType == qstr("image/webp")) { Ui::show( - Box(lang(lng_edit_media_album_error)), + Box(lang(lng_edit_media_invalid_file)), LayerOption::KeepOther); return true; }