diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index 7c2241ac4..beed1f8f1 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,8 +1,8 @@ @echo OFF -set "AppVersionStrSmall=0.7.1" -set "AppVersionStr=0.7.1" -set "AppVersionStrFull=0.7.1.0" +set "AppVersionStrSmall=0.7.2" +set "AppVersionStr=0.7.2" +set "AppVersionStrFull=0.7.2.0" echo. echo Preparing version %AppVersionStr%.. diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 6952c2d99..4ba267f44 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 7001; -static const wchar_t *AppVersionStr = L"0.7.1"; +static const int32 AppVersion = 7002; +static const wchar_t *AppVersionStr = L"0.7.2"; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 9020479df..a1591bdb8 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -2312,6 +2312,7 @@ mtpRequestId HistoryWidget::onForward(const PeerId &peer, SelectedItemSet toForw if (toForward.isEmpty()) return 0; if (toForward.size() == 1) { + App::main()->clearSelectedItems(); App::main()->showPeer(peer, 0, false, true); if (!hist) return 0; diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index a0b333d93..d42c473ac 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -1610,6 +1610,7 @@ void MainWidget::sentFullDatasReceived(const MTPmessages_StatedMessages &result) void MainWidget::forwardDone(PeerId peer, const MTPmessages_StatedMessages &result) { sentFullDatasReceived(result); if (hider) hider->forwardDone(); + clearSelectedItems(); showPeer(peer, 0, false, true); history.onClearSelected(); } diff --git a/Telegram/SourceFiles/title.cpp b/Telegram/SourceFiles/title.cpp index aa6a627c0..e06945712 100644 --- a/Telegram/SourceFiles/title.cpp +++ b/Telegram/SourceFiles/title.cpp @@ -189,29 +189,28 @@ void TitleWidget::updateBackButton() { if (!cWideMode() && App::main() && App::main()->selectingPeer()) { _cancel.show(); if (!_back.isHidden()) _back.hide(); - _settings.hide(); - _contacts.hide(); - _about.hide(); + if (!_settings.isHidden()) _settings.hide(); + if (!_contacts.isHidden()) _contacts.hide(); + if (!_about.isHidden()) _about.hide(); } else { - _cancel.hide(); + if (!_cancel.isHidden()) _cancel.hide(); bool authed = (MTP::authedId() > 0); if (cWideMode()) { if (!_back.isHidden()) _back.hide(); - _settings.show(); - if (authed) _contacts.show(); - _about.show(); + if (_settings.isHidden()) _settings.show(); + if (authed && _contacts.isHidden()) _contacts.show(); + if (_about.isHidden()) _about.show(); } else { - bool need = App::wnd()->needBackButton(); - if (need && _back.isHidden()) { - _back.show(); - _settings.hide(); - _contacts.hide(); - _about.hide(); - } else if (!need && !_back.isHidden()) { - _back.hide(); - _settings.show(); - if (authed) _contacts.show(); - _about.show(); + if (App::wnd()->needBackButton()) { + if (_back.isHidden()) _back.show(); + if (!_settings.isHidden()) _settings.hide(); + if (!_contacts.isHidden()) _contacts.hide(); + if (!_about.isHidden()) _about.hide(); + } else { + if (!_back.isHidden()) _back.hide(); + if (_settings.isHidden()) _settings.show(); + if (authed && _contacts.isHidden()) _contacts.show(); + if (_about.isHidden()) _about.show(); } } } diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 004ab1a0d..6fc60c5fb 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.7.1 + 0.7.2 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index c920a5905..7503b2bd3 100644 Binary files a/Telegram/Telegram.rc and b/Telegram/Telegram.rc differ diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index a6fce3b3f..d64087258 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1577,7 +1577,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.1; + CURRENT_PROJECT_VERSION = 0.7.2; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1595,7 +1595,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.7.1; + CURRENT_PROJECT_VERSION = 0.7.2; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1621,10 +1621,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.1; + CURRENT_PROJECT_VERSION = 0.7.2; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.7; - DYLIB_CURRENT_VERSION = 0.7.1; + DYLIB_CURRENT_VERSION = 0.7.2; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1764,10 +1764,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.1; + CURRENT_PROJECT_VERSION = 0.7.2; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.7; - DYLIB_CURRENT_VERSION = 0.7.1; + DYLIB_CURRENT_VERSION = 0.7.2; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; diff --git a/Telegram/Version.sh b/Telegram/Version.sh index 4e8cf234b..2da12a80c 100755 --- a/Telegram/Version.sh +++ b/Telegram/Version.sh @@ -1,2 +1,2 @@ -echo 7001 0.7.1 +echo 7002 0.7.2