From 528c98af67dee913fcb0973d2db2ebab06d02d45 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 17 Mar 2021 00:02:05 +0400 Subject: [PATCH] Beta version 2.6.4. - Fix freeze in voice chats. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/calls/calls_group_members.cpp | 2 +- Telegram/SourceFiles/core/changelogs.cpp | 4 ++++ Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 8 ++++---- changelog.txt | 4 ++++ 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 45a032d5f..c827b1e5f 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.6.4.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 4243985eb..c6c4e4a76 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 2,6,3,0 - PRODUCTVERSION 2,6,3,0 + FILEVERSION 2,6,4,0 + PRODUCTVERSION 2,6,4,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "2.6.3.0" + VALUE "FileVersion", "2.6.4.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.6.3.0" + VALUE "ProductVersion", "2.6.4.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 51d87df49..5b1d000ad 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 2,6,3,0 - PRODUCTVERSION 2,6,3,0 + FILEVERSION 2,6,4,0 + PRODUCTVERSION 2,6,4,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", "2.6.3.0" + VALUE "FileVersion", "2.6.4.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.6.3.0" + VALUE "ProductVersion", "2.6.4.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp index 0a76f0783..c7df6ec7e 100644 --- a/Telegram/SourceFiles/calls/calls_group_members.cpp +++ b/Telegram/SourceFiles/calls/calls_group_members.cpp @@ -1206,7 +1206,7 @@ void MembersController::checkRowPosition(not_null row) { }; delegate()->peerListSortRows(_peer->canManageGroupCall() ? makeComparator(projForAdmin) - : makeComparator(projForOther)); + : makeComparator(projForAdmin)); } void MembersController::updateRow( diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index 30287d565..82b4a3b8d 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -127,6 +127,10 @@ std::map BetaLogs() { "- Fix voice chat admin menu on macOS.\n" }, + { + 2006004, + "- Fix freeze in voice chats.\n" + }, }; }; diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 2d1587f2b..934604b0c 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 = 2006003; -constexpr auto AppVersionStr = "2.6.3"; +constexpr auto AppVersion = 2006004; +constexpr auto AppVersionStr = "2.6.4"; constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 755436c7f..cc84e5a5d 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2006003 +AppVersion 2006004 AppVersionStrMajor 2.6 -AppVersionStrSmall 2.6.3 -AppVersionStr 2.6.3 +AppVersionStrSmall 2.6.4 +AppVersionStr 2.6.4 BetaChannel 1 AlphaVersion 0 -AppVersionOriginal 2.6.3.beta +AppVersionOriginal 2.6.4.beta diff --git a/changelog.txt b/changelog.txt index e8f852b64..6081c553f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +2.6.4 beta (16.03.21) + +- Fix freeze in voice chats. + 2.6.3 beta (16.03.21) - Fix audio device selection in voice chats.