diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index ef4280fef..1422235cb 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -10,7 +10,7 @@ + Version="4.11.1.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 69de28dc8..5b638b602 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,0,0 - PRODUCTVERSION 4,12,0,0 + FILEVERSION 4,11,1,0 + PRODUCTVERSION 4,11,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.12.0.0" + VALUE "FileVersion", "4.11.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2023" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.12.0.0" + VALUE "ProductVersion", "4.11.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 2b17faabd..5903ca8d0 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,0,0 - PRODUCTVERSION 4,12,0,0 + FILEVERSION 4,11,1,0 + PRODUCTVERSION 4,11,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.12.0.0" + VALUE "FileVersion", "4.11.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2023" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.12.0.0" + VALUE "ProductVersion", "4.11.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index f47adfecc..8bdb91ffd 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 = 4012000; -constexpr auto AppVersionStr = "4.12"; +constexpr auto AppVersion = 4011001; +constexpr auto AppVersionStr = "4.11.1"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp index ea09d9b14..483a8d280 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp @@ -746,7 +746,7 @@ void DraftOptionsBox( const auto &resolver = args.resolver; state->performSwitch = [=](const QString &link, WebPageData *page) { const auto now = base::unixtime::now(); - if (!page || page->pendingTill > 0 && page->pendingTill < now) { + if (!page || (page->pendingTill > 0 && page->pendingTill < now)) { show->showToast(tr::lng_preview_cant(tr::now)); } else if (page->pendingTill > 0) { const auto delay = std::max(page->pendingTill - now, TimeId()); diff --git a/Telegram/build/version b/Telegram/build/version index 9eccfd632..de406d1d2 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 4012000 -AppVersionStrMajor 4.12 -AppVersionStrSmall 4.12 -AppVersionStr 4.12.0 +AppVersion 4011001 +AppVersionStrMajor 4.11 +AppVersionStrSmall 4.11.1 +AppVersionStr 4.11.1 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 4.12 +AppVersionOriginal 4.11.1 diff --git a/changelog.txt b/changelog.txt index 2dc035e39..c201151d7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,4 @@ -4.12 (29.10.23) +4.11.1 (29.10.23) - Fix crash in emoji status select. - Fix crash in language change.