RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Version 0.10.11: two more crash fixes.

This commit is contained in:
John Preston 2016-10-03 18:00:54 +03:00
parent f710fe2dd3
commit b600050057
6 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/Resources/winrc/Telegram.rc
View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,10,0 FILEVERSION 0,10,11,0
PRODUCTVERSION 0,10,10,0 PRODUCTVERSION 0,10,11,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.10.0" VALUE "FileVersion", "0.10.11.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.10.0" VALUE "ProductVersion", "0.10.11.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

8
Telegram/Resources/winrc/Updater.rc
View File

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,10,0 FILEVERSION 0,10,11,0
PRODUCTVERSION 0,10,10,0 PRODUCTVERSION 0,10,11,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.10.0" VALUE "FileVersion", "0.10.11.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.10.0" VALUE "ProductVersion", "0.10.11.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

2
Telegram/SourceFiles/boxes/report_box.cpp
View File

@ -83,11 +83,11 @@ void ReportBox::onChange() {
connect(_reasonOtherText, SIGNAL(submitted(bool)), this, SLOT(onReport())); connect(_reasonOtherText, SIGNAL(submitted(bool)), this, SLOT(onReport()));
connect(_reasonOtherText, SIGNAL(cancelled()), this, SLOT(onClose())); connect(_reasonOtherText, SIGNAL(cancelled()), this, SLOT(onClose()));
} }
_reasonOtherText->setFocus();
} else if (_reasonOtherText) { } else if (_reasonOtherText) {
_reasonOtherText.destroy(); _reasonOtherText.destroy();
updateMaxHeight(); updateMaxHeight();
} }
_reasonOtherText->setFocus();
} }
void ReportBox::doSetInnerFocus() { void ReportBox::doSetInnerFocus() {

4
Telegram/SourceFiles/core/version.h
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 = 10010; constexpr int AppVersion = 10011;
constexpr str_const AppVersionStr = "0.10.10"; constexpr str_const AppVersionStr = "0.10.11";
constexpr bool AppAlphaVersion = false; constexpr bool AppAlphaVersion = false;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

12
Telegram/SourceFiles/history/history_message.cpp
View File

@ -2011,10 +2011,11 @@ bool HistoryService::prepareGameScoreText(const QString &from, QString *outText,
} else { } else {
gameTitle = lang(lng_deleted_message); gameTitle = lang(lng_deleted_message);
} }
auto scoreNumber = gamescore ? gamescore->score : 0;
if (_from->isSelf()) { if (_from->isSelf()) {
*outText = lng_action_game_you_scored(lt_count, gamescore->score, lt_game, gameTitle); *outText = lng_action_game_you_scored(lt_count, scoreNumber, lt_game, gameTitle);
} else { } else {
*outText = lng_action_game_score(lt_from, from, lt_count, gamescore->score, lt_game, gameTitle); *outText = lng_action_game_score(lt_from, from, lt_count, scoreNumber, lt_game, gameTitle);
} }
if (second) { if (second) {
outLinks->push_back(second); outLinks->push_back(second);
@ -2212,12 +2213,13 @@ HistoryTextState HistoryService::getState(int x, int y, HistoryStateRequest requ
} }
void HistoryService::createFromMtp(const MTPDmessageService &message) { void HistoryService::createFromMtp(const MTPDmessageService &message) {
if (message.vaction.type() == mtpc_messageActionGameScore) {
UpdateComponents(HistoryServiceGameScore::Bit());
Get<HistoryServiceGameScore>()->score = message.vaction.c_messageActionGameScore().vscore.v;
}
if (message.has_reply_to_msg_id()) { if (message.has_reply_to_msg_id()) {
if (message.vaction.type() == mtpc_messageActionPinMessage) { if (message.vaction.type() == mtpc_messageActionPinMessage) {
UpdateComponents(HistoryServicePinned::Bit()); UpdateComponents(HistoryServicePinned::Bit());
} else if (message.vaction.type() == mtpc_messageActionGameScore) {
UpdateComponents(HistoryServiceGameScore::Bit());
Get<HistoryServiceGameScore>()->score = message.vaction.c_messageActionGameScore().vscore.v;
} }
if (auto dependent = GetDependentData()) { if (auto dependent = GetDependentData()) {
dependent->msgId = message.vreply_to_msg_id.v; dependent->msgId = message.vreply_to_msg_id.v;

6
Telegram/build/version
View File

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