diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index dc3fc7505..f9c77dfc0 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -1051,14 +1051,11 @@ void AppClass::checkMapVersion() { if (Local::oldMapVersion() < AppVersion) { if (Local::oldMapVersion()) { QString versionFeatures; - if ((cDevVersion() || cBetaVersion()) && Local::oldMapVersion() < 9022) { - if (cPlatform() == dbipMac || cPlatform() == dbipMacOld) { - versionFeatures = QString::fromUtf8("\xe2\x80\x94 Voice messages waveform visualizations\n\xe2\x80\x94 Bug fixes and other minor improvements");// .replace('@', qsl("@") + QChar(0x200D)); - } else { - versionFeatures = QString::fromUtf8("\xe2\x80\x94 Voice messages waveform visualizations\n\xe2\x80\x94 Bug fixes and other minor improvements");// .replace('@', qsl("@") + QChar(0x200D)); - } - } else if (Local::oldMapVersion() < 9016) { - versionFeatures = lng_new_version_text(lt_gifs_link, qsl("https://telegram.org/blog/gif-revolution"), lt_bots_link, qsl("https://telegram.org/blog/inline-bots")).trimmed(); + if ((cDevVersion() || cBetaVersion()) && Local::oldMapVersion() < 9024) { +// versionFeatures = QString::fromUtf8("\xe2\x80\x94 Voice messages waveform visualizations\n\xe2\x80\x94 Bug fixes and other minor improvements");// .replace('@', qsl("@") + QChar(0x200D)); + versionFeatures = lang(lng_new_version_minor).trimmed(); + } else if (Local::oldMapVersion() < 9024) { + versionFeatures = lang(lng_new_version_text).trimmed(); } else { versionFeatures = lang(lng_new_version_minor).trimmed(); } diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 363e19b56..e8981faae 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -20,9 +20,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 9023; -static const wchar_t *AppVersionStr = L"0.9.23"; -static const bool DevVersion = true; +static const int32 AppVersion = 9024; +static const wchar_t *AppVersionStr = L"0.9.24"; +static const bool DevVersion = false; //#define BETA_VERSION (9019002ULL) // just comment this line to build public version static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; diff --git a/Telegram/SourceFiles/dialogswidget.cpp b/Telegram/SourceFiles/dialogswidget.cpp index f968d3d57..889580af4 100644 --- a/Telegram/SourceFiles/dialogswidget.cpp +++ b/Telegram/SourceFiles/dialogswidget.cpp @@ -963,7 +963,9 @@ void DialogsInner::dialogsReceived(const QVector &added) { case mtpc_dialog: { const MTPDdialog &d(i->c_dialog()); history = App::historyFromDialog(peerFromMTP(d.vpeer), d.vunread_count.v, d.vread_inbox_max_id.v); - App::main()->applyNotifySetting(MTP_notifyPeer(d.vpeer), d.vnotify_settings, history); + if (App::main()) { + App::main()->applyNotifySetting(MTP_notifyPeer(d.vpeer), d.vnotify_settings, history); + } } break; case mtpc_dialogChannel: { @@ -986,7 +988,9 @@ void DialogsInner::dialogsReceived(const QVector &added) { if (!history->isMegagroup() && d.vtop_message.v > d.vtop_important_message.v) { history->setNotLoadedAtBottom(); } - App::main()->applyNotifySetting(MTP_notifyPeer(d.vpeer), d.vnotify_settings, history); + if (App::main()) { + App::main()->applyNotifySetting(MTP_notifyPeer(d.vpeer), d.vnotify_settings, history); + } } break; } diff --git a/Telegram/SourceFiles/overviewwidget.cpp b/Telegram/SourceFiles/overviewwidget.cpp index 919f770a2..f00799cf6 100644 --- a/Telegram/SourceFiles/overviewwidget.cpp +++ b/Telegram/SourceFiles/overviewwidget.cpp @@ -1821,19 +1821,25 @@ void OverviewInner::itemRemoved(HistoryItem *item) { _overview->updateTopBarSelection(); } - onUpdateSelected(); + LayoutItems::iterator j = _layoutItems.find(item); + if (j != _layoutItems.cend()) { + int32 index = _items.indexOf(j.value()); + if (index >= 0) { + _items.remove(index); + } + delete j.value(); + _layoutItems.erase(j); + } - if (_dragSelFrom == msgId) { + if (_dragSelFrom == msgId || _dragSelTo == msgId) { _dragSelFrom = 0; _dragSelFromIndex = -1; - } - if (_dragSelTo == msgId) { _dragSelTo = 0; _dragSelToIndex = -1; + update(); } - updateDragSelection(_dragSelFrom, _dragSelFromIndex, _dragSelTo, _dragSelToIndex, _dragSelecting); - update(); + onUpdateSelected(); } void OverviewInner::repaintItem(const HistoryItem *msg) { diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 468ce68fd..48739e2a3 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.23 + 0.9.24 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 036e34bc7..a73c381b1 100644 --- a/Telegram/Telegram.rc +++ b/Telegram/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "SourceFiles\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,23,0 - PRODUCTVERSION 0,9,23,0 + FILEVERSION 0,9,24,0 + PRODUCTVERSION 0,9,24,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.9.23.0" + VALUE "FileVersion", "0.9.24.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.23.0" + VALUE "ProductVersion", "0.9.24.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 3f464ec55..90ee76899 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1720,7 +1720,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.23; + CURRENT_PROJECT_VERSION = 0.9.24; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1739,7 +1739,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.9.23; + CURRENT_PROJECT_VERSION = 0.9.24; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1768,10 +1768,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.23; + CURRENT_PROJECT_VERSION = 0.9.24; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 0.9; - DYLIB_CURRENT_VERSION = 0.9.23; + DYLIB_CURRENT_VERSION = 0.9.24; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1909,10 +1909,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.23; + CURRENT_PROJECT_VERSION = 0.9.24; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.9; - DYLIB_CURRENT_VERSION = 0.9.23; + DYLIB_CURRENT_VERSION = 0.9.24; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ""; diff --git a/Telegram/Version b/Telegram/Version index 98e88320e..5108f1ff6 100644 --- a/Telegram/Version +++ b/Telegram/Version @@ -1,6 +1,6 @@ -AppVersion 9023 +AppVersion 9024 AppVersionStrMajor 0.9 -AppVersionStrSmall 0.9.23 -AppVersionStr 0.9.23 -DevChannel 1 +AppVersionStrSmall 0.9.24 +AppVersionStr 0.9.24 +DevChannel 0 BetaVersion 0 9019002