0.9.59 alpha version: crash on logout fixed.

This commit is contained in:
John Preston 2016-07-23 09:39:46 +03:00
parent 26723fb820
commit 5b7a17e044
6 changed files with 22 additions and 16 deletions

View file

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,58,0 FILEVERSION 0,9,59,0
PRODUCTVERSION 0,9,58,0 PRODUCTVERSION 0,9,59,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.9.58.0" VALUE "FileVersion", "0.9.59.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.9.58.0" VALUE "ProductVersion", "0.9.59.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,9,58,0 FILEVERSION 0,9,59,0
PRODUCTVERSION 0,9,58,0 PRODUCTVERSION 0,9,59,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.9.58.0" VALUE "FileVersion", "0.9.59.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.9.58.0" VALUE "ProductVersion", "0.9.59.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 = 9058; constexpr int AppVersion = 9059;
constexpr str_const AppVersionStr = "0.9.58"; constexpr str_const AppVersionStr = "0.9.59";
constexpr bool AppAlphaVersion = true; constexpr bool AppAlphaVersion = true;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

View file

@ -357,7 +357,13 @@ void AudioPlayer::onStopped(const AudioMsgId &audio) {
} }
AudioPlayer::AudioMsg *AudioPlayer::dataForType(AudioMsgId::Type type, int index) { AudioPlayer::AudioMsg *AudioPlayer::dataForType(AudioMsgId::Type type, int index) {
if (index < 0) index = *currentIndex(type); if (index < 0) {
if (auto indexPtr = currentIndex(type)) {
index = *indexPtr;
} else {
return nullptr;
}
}
switch (type) { switch (type) {
case AudioMsgId::Type::Voice: return &_audioData[index]; case AudioMsgId::Type::Voice: return &_audioData[index];
case AudioMsgId::Type::Song: return &_songData[index]; case AudioMsgId::Type::Song: return &_songData[index];

View file

@ -2531,7 +2531,7 @@
SDKROOT = macosx; SDKROOT = macosx;
SYMROOT = ./../Mac; SYMROOT = ./../Mac;
TDESKTOP_MAJOR_VERSION = 0.9; TDESKTOP_MAJOR_VERSION = 0.9;
TDESKTOP_VERSION = 0.9.58; TDESKTOP_VERSION = 0.9.59;
}; };
name = Release; name = Release;
}; };
@ -2672,7 +2672,7 @@
SDKROOT = macosx; SDKROOT = macosx;
SYMROOT = ./../Mac; SYMROOT = ./../Mac;
TDESKTOP_MAJOR_VERSION = 0.9; TDESKTOP_MAJOR_VERSION = 0.9;
TDESKTOP_VERSION = 0.9.58; TDESKTOP_VERSION = 0.9.59;
}; };
name = Debug; name = Debug;
}; };

View file

@ -1,6 +1,6 @@
AppVersion 9058 AppVersion 9059
AppVersionStrMajor 0.9 AppVersionStrMajor 0.9
AppVersionStrSmall 0.9.58 AppVersionStrSmall 0.9.59
AppVersionStr 0.9.58 AppVersionStr 0.9.59
AlphaChannel 1 AlphaChannel 1
BetaVersion 0 BetaVersion 0