From 1af2769209a69cf0fbde6215015bf2de19e08f61 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 3 May 2018 22:07:01 +0300 Subject: [PATCH] Closed beta 1.2.17.4: Fix option lookup. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 2 +- Telegram/SourceFiles/mtproto/dc_options.cpp | 5 +---- Telegram/build/version | 2 +- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 28c5bc79e..07cbf3c53 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.2.17.4" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 482b1f70d..0572d3605 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,17,3 - PRODUCTVERSION 1,2,17,3 + FILEVERSION 1,2,17,4 + PRODUCTVERSION 1,2,17,4 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -52,10 +52,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.2.17.3" + VALUE "FileVersion", "1.2.17.4" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.17.3" + VALUE "ProductVersion", "1.2.17.4" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index cdaf87a73..49308fd5d 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,17,3 - PRODUCTVERSION 1,2,17,3 + FILEVERSION 1,2,17,4 + PRODUCTVERSION 1,2,17,4 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.2.17.3" + VALUE "FileVersion", "1.2.17.4" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.17.3" + VALUE "ProductVersion", "1.2.17.4" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 28ed7cf0d..3f42a14e4 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/utils.h" -#define BETA_VERSION_MACRO (1002017003ULL) +#define BETA_VERSION_MACRO (1002017004ULL) constexpr int AppVersion = 1002017; constexpr str_const AppVersionStr = "1.2.17"; diff --git a/Telegram/SourceFiles/mtproto/dc_options.cpp b/Telegram/SourceFiles/mtproto/dc_options.cpp index 2ab6281af..c24d206de 100644 --- a/Telegram/SourceFiles/mtproto/dc_options.cpp +++ b/Telegram/SourceFiles/mtproto/dc_options.cpp @@ -595,10 +595,7 @@ auto DcOptions::lookup( const auto flags = endpoint.flags; if (type == DcType::Cdn && !(flags & Flag::f_cdn)) { continue; - } else if (throughProxy && !(flags & Flag::f_static)) { - continue; - } - if (type != DcType::MediaDownload + } else if (type != DcType::MediaDownload && (flags & Flag::f_media_only)) { continue; } diff --git a/Telegram/build/version b/Telegram/build/version index 5e00cf20d..93f270f93 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,4 +3,4 @@ AppVersionStrMajor 1.2 AppVersionStrSmall 1.2.17 AppVersionStr 1.2.17 AlphaChannel 0 -BetaVersion 1002017003 +BetaVersion 1002017004