From 43bdfbf1703a0af34392ee73c8f96dcd69fc611f Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 23 Sep 2022 23:50:37 +0400 Subject: [PATCH] Beta version 4.2.2. - Fix crash in spoiler revealing in media captions. - Fix spoiler revealing in media viewer captions. - Fix crash in folder editing on Linux. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/changelogs.cpp | 8 ++++++++ Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 8 ++++---- changelog.txt | 6 ++++++ 7 files changed, 29 insertions(+), 15 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 207e3decc5..85f9a19f05 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -10,7 +10,7 @@ + Version="4.2.2.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 43908fb196..254635e242 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,2,1,0 - PRODUCTVERSION 4,2,1,0 + FILEVERSION 4,2,2,0 + PRODUCTVERSION 4,2,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "4.2.1.0" + VALUE "FileVersion", "4.2.2.0" VALUE "LegalCopyright", "Copyright (C) 2014-2022" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.2.1.0" + VALUE "ProductVersion", "4.2.2.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 907c46c15f..f69e4ecb02 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,2,1,0 - PRODUCTVERSION 4,2,1,0 + FILEVERSION 4,2,2,0 + PRODUCTVERSION 4,2,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "4.2.1.0" + VALUE "FileVersion", "4.2.2.0" VALUE "LegalCopyright", "Copyright (C) 2014-2022" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.2.1.0" + VALUE "ProductVersion", "4.2.2.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index 0001dad84e..0c6068539d 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -68,6 +68,14 @@ std::map BetaLogs() { "- Improve touch support in channel comments.\n" "- Nice animation for spoilers.\n" + }, + { + 4002002, + "- Fix crash in spoiler revealing in media captions.\n" + + "- Fix spoiler revealing in media viewer captions.\n" + + "- Fix crash in folder editing on Linux.\n" } }; }; diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 2426ecc984..a97fe7b4b8 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppName = "Telegram Desktop"_cs; constexpr auto AppFile = "Telegram"_cs; -constexpr auto AppVersion = 4002001; -constexpr auto AppVersionStr = "4.2.1"; +constexpr auto AppVersion = 4002002; +constexpr auto AppVersionStr = "4.2.2"; constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index f6e27e3891..43616f74d8 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 4002001 +AppVersion 4002002 AppVersionStrMajor 4.2 -AppVersionStrSmall 4.2.1 -AppVersionStr 4.2.1 +AppVersionStrSmall 4.2.2 +AppVersionStr 4.2.2 BetaChannel 1 AlphaVersion 0 -AppVersionOriginal 4.2.1.beta +AppVersionOriginal 4.2.2.beta diff --git a/changelog.txt b/changelog.txt index c6afbcb8f1..25a81a6f70 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +4.2.2 beta (23.09.22) + +- Fix crash in spoiler revealing in media captions. +- Fix spoiler revealing in media viewer captions. +- Fix crash in folder editing on Linux. + 4.2.1 beta (22.09.22) - Improve scaling / cropping for photos / video files.