From b8614c60f94895e2f77a15111af8d66c62aada84 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 3 Feb 2018 23:26:39 +0300 Subject: [PATCH] Closed beta 1.2.8.3. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/apiwrap.cpp | 5 ++++- Telegram/SourceFiles/core/version.h | 2 +- Telegram/SourceFiles/history/history.h | 2 -- Telegram/SourceFiles/history/history_item.cpp | 4 ++-- Telegram/build/version | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 3aa5c777d..6fc92c385 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.2.8.3" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 7834573cd..2ac3d12a5 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,8,2 - PRODUCTVERSION 1,2,8,2 + FILEVERSION 1,2,8,3 + PRODUCTVERSION 1,2,8,3 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.8.2" + VALUE "FileVersion", "1.2.8.3" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.8.2" + VALUE "ProductVersion", "1.2.8.3" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index f727ce10c..e91585f9e 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,8,2 - PRODUCTVERSION 1,2,8,2 + FILEVERSION 1,2,8,3 + PRODUCTVERSION 1,2,8,3 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.8.2" + VALUE "FileVersion", "1.2.8.3" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.8.2" + VALUE "ProductVersion", "1.2.8.3" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 17feed211..acf15e712 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -3799,7 +3799,10 @@ void ApiWrap::readFeeds() { auto delay = kFeedReadTimeout; const auto now = getms(true); for (auto i = begin(_feedReadsDelayed); i != end(_feedReadsDelayed);) { - const auto [feed, time] = *i; + const auto feed = i->first; + const auto time = i->second; + // Clang fails to capture structure-binded feed to lambda :( + //const auto [feed, time] = *i; if (time > now) { accumulate_min(delay, time - now); ++i; diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index b963d7e7c..b20249c2a 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 (1002008002ULL) +#define BETA_VERSION_MACRO (1002008003ULL) constexpr int AppVersion = 1002008; constexpr str_const AppVersionStr = "1.2.8"; diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h index fd3351992..74fed55e1 100644 --- a/Telegram/SourceFiles/history/history.h +++ b/Telegram/SourceFiles/history/history.h @@ -521,8 +521,6 @@ private: Ui::SendActionAnimation _sendActionAnimation; QMap _mySendActions; - int _pinnedIndex = 0; // > 0 for pinned dialogs - std::weak_ptr _adminLogIdManager; }; diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index 231dfb0af..ef20a27cd 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -78,10 +78,10 @@ HistoryItem::HistoryItem( TimeId date, UserId from) : id(id) -, _date(date) , _history(history) , _from(from ? App::user(from) : history->peer) -, _flags(flags) { +, _flags(flags) +, _date(date) { App::historyRegItem(this); } diff --git a/Telegram/build/version b/Telegram/build/version index a733b6adf..f3aac9579 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,4 +3,4 @@ AppVersionStrMajor 1.2 AppVersionStrSmall 1.2.8 AppVersionStr 1.2.8 AlphaChannel 0 -BetaVersion 1002008002 +BetaVersion 1002008003