From b5eb88a32f4038a27a514978e9417088f6c7ecd9 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 5 Mar 2019 18:10:26 +0400 Subject: [PATCH] Closed alpha version 1.5.15.2. --- 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 +- .../SourceFiles/media/streaming/media_streaming_file.h | 1 - Telegram/build/version | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 11f577292..5b646c21b 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.5.15.2" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 101b1f738..1b100996b 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,5,15,1 - PRODUCTVERSION 1,5,15,1 + FILEVERSION 1,5,15,2 + PRODUCTVERSION 1,5,15,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -52,10 +52,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.5.15.1" + VALUE "FileVersion", "1.5.15.2" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.5.15.1" + VALUE "ProductVersion", "1.5.15.2" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 381468574..90f894fac 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,5,15,1 - PRODUCTVERSION 1,5,15,1 + FILEVERSION 1,5,15,2 + PRODUCTVERSION 1,5,15,2 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.5.15.1" + VALUE "FileVersion", "1.5.15.2" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.5.15.1" + VALUE "ProductVersion", "1.5.15.2" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index c8d07fc78..84469dbeb 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#define TDESKTOP_REQUESTED_ALPHA_VERSION (1005015001ULL) +#define TDESKTOP_REQUESTED_ALPHA_VERSION (1005015002ULL) #ifdef TDESKTOP_OFFICIAL_TARGET #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_file.h b/Telegram/SourceFiles/media/streaming/media_streaming_file.h index 38a4c687e..5faf2473f 100644 --- a/Telegram/SourceFiles/media/streaming/media_streaming_file.h +++ b/Telegram/SourceFiles/media/streaming/media_streaming_file.h @@ -89,7 +89,6 @@ private: int _offset = 0; int _size = 0; bool _failed = false; - bool _opened = false; bool _readTillEnd = false; crl::semaphore _semaphore; std::atomic _interrupted = false; diff --git a/Telegram/build/version b/Telegram/build/version index 91f157258..854c22e0d 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,4 +3,4 @@ AppVersionStrMajor 1.5 AppVersionStrSmall 1.5.15 AppVersionStr 1.5.15 BetaChannel 0 -AlphaVersion 1005015001 +AlphaVersion 1005015002