From 0d134f2b89c8fd3846e9eff0a2f9dedcdbebaf9a Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 6 Feb 2023 20:42:51 +0400 Subject: [PATCH] Version 4.6.1. - Fix fonts fallback on Windows. - Fix crash in userpic editor. - Fix some crashes on 32 bit Window build. - Bug fixes and other minor improvements. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 8 ++++---- Telegram/lib_base | 2 +- Telegram/lib_ui | 2 +- changelog.txt | 7 +++++++ 8 files changed, 24 insertions(+), 17 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 60e1ac893..26d552e49 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -10,7 +10,7 @@ + Version="4.6.1.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 57dbef1bc..c80dd9cb5 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,6,0,0 - PRODUCTVERSION 4,6,0,0 + FILEVERSION 4,6,1,0 + PRODUCTVERSION 4,6,1,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.6.0.0" + VALUE "FileVersion", "4.6.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2023" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.6.0.0" + VALUE "ProductVersion", "4.6.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 020b2bf23..a1e23626f 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,6,0,0 - PRODUCTVERSION 4,6,0,0 + FILEVERSION 4,6,1,0 + PRODUCTVERSION 4,6,1,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.6.0.0" + VALUE "FileVersion", "4.6.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2023" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.6.0.0" + VALUE "ProductVersion", "4.6.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index d5fce7ea7..e2d6b52db 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 = 4006000; -constexpr auto AppVersionStr = "4.6"; +constexpr auto AppVersion = 4006001; +constexpr auto AppVersionStr = "4.6.1"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index ba60a1262..dc61870ca 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 4006000 +AppVersion 4006001 AppVersionStrMajor 4.6 -AppVersionStrSmall 4.6 -AppVersionStr 4.6.0 +AppVersionStrSmall 4.6.1 +AppVersionStr 4.6.1 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 4.6 +AppVersionOriginal 4.6.1 diff --git a/Telegram/lib_base b/Telegram/lib_base index 0698cd1af..d043c38a6 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 0698cd1af30b09b66d5eee7dfa93c4d489086660 +Subproject commit d043c38a6a5652b341976b6e089f5ab8fbee7331 diff --git a/Telegram/lib_ui b/Telegram/lib_ui index e053e0460..98fa93787 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit e053e04607653c8a304c72ff901a8e628dd94dbf +Subproject commit 98fa93787a13d8ad9427facb465500fe3179860e diff --git a/changelog.txt b/changelog.txt index 620260405..836130d16 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,10 @@ +4.6.1 (06.02.23) + +- Fix fonts fallback on Windows. +- Fix crash in userpic editor. +- Fix some crashes on 32 bit Window build. +- Bug fixes and other minor improvements. + 4.6 (03.02.23) - Emoji Profile Pictures. Quickly create group and profile pictures from animated emoji and stickers with the new "Use an Emoji" option.