summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Preston <johnprestonmail@gmail.com>2023-12-01 12:01:28 +0400
committerJohn Preston <johnprestonmail@gmail.com>2023-12-01 13:07:42 +0400
commitcb3dece4789197ac0cae5391bcc5cc9d1749f7ae (patch)
tree918945fe04fcaa447fdc29ab5ebf1f4cf7f48224
parentc86ca6a61a1bd9de83a5a7cd9a845d3474a0221f (diff)
Version 4.12.2.v4.12.2
- Fix choosing custom reactions in channels. Also fix a crash on start with old hardware by rebuilding using the 17.7.7 VS Build Tools, because 17.8.* has a regression with emitting a SSE 4.2 instruction, see: https://developercommunity.visualstudio.com/t/Illegal-Instruction-SSE-42-POPCNT-exc/10520578
-rw-r--r--Telegram/Resources/uwp/AppX/AppxManifest.xml2
-rw-r--r--Telegram/Resources/winrc/Telegram.rc8
-rw-r--r--Telegram/Resources/winrc/Updater.rc8
-rw-r--r--Telegram/SourceFiles/core/version.h4
-rw-r--r--Telegram/build/version8
-rw-r--r--changelog.txt5
6 files changed, 20 insertions, 15 deletions
diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index d60cd07b22..f983e85856 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
- Version="4.12.1.0" />
+ Version="4.12.2.0" />
<Properties>
<DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 8883098f28..b2f5c49e7f 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,12,1,0
- PRODUCTVERSION 4,12,1,0
+ FILEVERSION 4,12,2,0
+ PRODUCTVERSION 4,12,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.12.1.0"
+ VALUE "FileVersion", "4.12.2.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2023"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "4.12.1.0"
+ VALUE "ProductVersion", "4.12.2.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index cc4cc845af..95e556c9ab 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,12,1,0
- PRODUCTVERSION 4,12,1,0
+ FILEVERSION 4,12,2,0
+ PRODUCTVERSION 4,12,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.12.1.0"
+ VALUE "FileVersion", "4.12.2.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2023"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "4.12.1.0"
+ VALUE "ProductVersion", "4.12.2.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 4291098d82..a5ae5ed6cb 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 = 4012001;
-constexpr auto AppVersionStr = "4.12.1";
+constexpr auto AppVersion = 4012002;
+constexpr auto AppVersionStr = "4.12.2";
constexpr auto AppBetaVersion = false;
constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index d1f1bb7cab..e2d583a7cc 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion 4012001
+AppVersion 4012002
AppVersionStrMajor 4.12
-AppVersionStrSmall 4.12.1
-AppVersionStr 4.12.1
+AppVersionStrSmall 4.12.2
+AppVersionStr 4.12.2
BetaChannel 0
AlphaVersion 0
-AppVersionOriginal 4.12.1
+AppVersionOriginal 4.12.2
diff --git a/changelog.txt b/changelog.txt
index e49bb5adad..7ddf4f2939 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+4.12.2 (01.12.23)
+
+- Fix choosing custom reactions in channels.
+- Fix crash on launch using old hardware. (Windows)
+
4.12.1 (01.12.23)
- Fix assertion violation with imported messages.