0.10.10: Crashfix: Removed infinite recursion in Ui::FadeAnimation().

This commit is contained in:
John Preston 2016-10-03 13:08:22 +03:00
parent 1cc1aab823
commit f710fe2dd3
5 changed files with 14 additions and 14 deletions

View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,9,0 FILEVERSION 0,10,10,0
PRODUCTVERSION 0,10,9,0 PRODUCTVERSION 0,10,10,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.10.9.0" VALUE "FileVersion", "0.10.10.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.9.0" VALUE "ProductVersion", "0.10.10.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

View File

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,9,0 FILEVERSION 0,10,10,0
PRODUCTVERSION 0,10,9,0 PRODUCTVERSION 0,10,10,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -43,10 +43,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Updater" VALUE "FileDescription", "Telegram Updater"
VALUE "FileVersion", "0.10.9.0" VALUE "FileVersion", "0.10.10.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.9.0" VALUE "ProductVersion", "0.10.10.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

View File

@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#define BETA_VERSION_MACRO (0ULL) #define BETA_VERSION_MACRO (0ULL)
constexpr int AppVersion = 10009; constexpr int AppVersion = 10010;
constexpr str_const AppVersionStr = "0.10.9"; constexpr str_const AppVersionStr = "0.10.10";
constexpr bool AppAlphaVersion = false; constexpr bool AppAlphaVersion = false;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

View File

@ -103,7 +103,7 @@ void FadeAnimation::startAnimation(int duration) {
} }
void FadeAnimation::updateCallback() { void FadeAnimation::updateCallback() {
if (_animation.animating(getms())) { if (_animation.animating()) {
_widget->update(); _widget->update();
if (_updatedCallback) { if (_updatedCallback) {
_updatedCallback(_animation.current(_visible ? 1. : 0.)); _updatedCallback(_animation.current(_visible ? 1. : 0.));

View File

@ -1,6 +1,6 @@
AppVersion 10009 AppVersion 10010
AppVersionStrMajor 0.10 AppVersionStrMajor 0.10
AppVersionStrSmall 0.10.9 AppVersionStrSmall 0.10.10
AppVersionStr 0.10.9 AppVersionStr 0.10.10
AlphaChannel 0 AlphaChannel 0
BetaVersion 0 BetaVersion 0