From 61b55706aee63db7ccf5765afd34634e22ecf503 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 11 Feb 2017 11:00:21 +0300 Subject: [PATCH] Alpha 1.0.9: crash fix in video playback. Media::Player::Instance started to notify about all sound playback updates, even for video files (which do not have DocumentData filled in), while Media::Player widgets were relying on the existance of DocumentData in each update. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/SourceFiles/media/player/media_player_cover.cpp | 2 +- Telegram/SourceFiles/media/player/media_player_widget.cpp | 2 +- Telegram/build/version | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index c935f3d1db..040bb1cfa1 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.0.9.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 24397d05de..a40279cd05 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,0,8,0 - PRODUCTVERSION 1,0,8,0 + FILEVERSION 1,0,9,0 + PRODUCTVERSION 1,0,9,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -52,10 +52,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop official messenger" - VALUE "FileVersion", "1.0.8.0" + VALUE "FileVersion", "1.0.9.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.8.0" + VALUE "ProductVersion", "1.0.9.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 5fe87b1dee..590ad6c18e 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,0,8,0 - PRODUCTVERSION 1,0,8,0 + FILEVERSION 1,0,9,0 + PRODUCTVERSION 1,0,9,0 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.0.8.0" + VALUE "FileVersion", "1.0.9.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.8.0" + VALUE "ProductVersion", "1.0.9.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index e83cc6187d..0fe4fcd57c 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 1000008; -constexpr str_const AppVersionStr = "1.0.8"; +constexpr int AppVersion = 1000009; +constexpr str_const AppVersionStr = "1.0.9"; constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/media/player/media_player_cover.cpp b/Telegram/SourceFiles/media/player/media_player_cover.cpp index 436d476eed..5b19d9118a 100644 --- a/Telegram/SourceFiles/media/player/media_player_cover.cpp +++ b/Telegram/SourceFiles/media/player/media_player_cover.cpp @@ -227,7 +227,7 @@ void CoverWidget::updateRepeatTrackIcon() { } void CoverWidget::handleSongUpdate(const TrackState &state) { - if (!state.id || !state.id.audio()->song()) { + if (!state.id.audio() || !state.id.audio()->song()) { return; } diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp index 61420a062b..4bd714316e 100644 --- a/Telegram/SourceFiles/media/player/media_player_widget.cpp +++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp @@ -300,7 +300,7 @@ void Widget::updateRepeatTrackIcon() { } void Widget::handleSongUpdate(const TrackState &state) { - if (!state.id || !state.id.audio()->song()) { + if (!state.id.audio() || !state.id.audio()->song()) { return; } diff --git a/Telegram/build/version b/Telegram/build/version index 1b0a969e30..405397a642 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1000008 +AppVersion 1000009 AppVersionStrMajor 1.0 -AppVersionStrSmall 1.0.8 -AppVersionStr 1.0.8 +AppVersionStrSmall 1.0.9 +AppVersionStr 1.0.9 AlphaChannel 1 BetaVersion 0