From 25b6740f913bbf461dd310d3271e010d8d147ebe Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 31 Aug 2015 18:05:57 +0300 Subject: [PATCH] version 0.8.54.dev prepared, two crash fixes --- Telegram/PrepareWin.bat | 8 ++++---- Telegram/SourceFiles/application.cpp | 4 ++-- Telegram/SourceFiles/config.h | 4 ++-- Telegram/SourceFiles/history.cpp | 2 +- Telegram/SourceFiles/pspecific_wnd.cpp | 3 --- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5540 -> 5540 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version.sh | 2 +- 9 files changed, 17 insertions(+), 20 deletions(-) diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index 3a4b7051c..96dd97f9b 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,10 +1,10 @@ @echo OFF set "AppVersionStrMajor=0.8" -set "AppVersion=8053" -set "AppVersionStrSmall=0.8.53" -set "AppVersionStr=0.8.53" -set "AppVersionStrFull=0.8.53.0" +set "AppVersion=8054" +set "AppVersionStrSmall=0.8.54" +set "AppVersionStr=0.8.54" +set "AppVersionStrFull=0.8.54.0" set "DevChannel=1" if %DevChannel% neq 0 goto preparedev diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index 4b736c5f5..a07696d53 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -673,8 +673,8 @@ void Application::checkMapVersion() { if (Local::oldMapVersion() < AppVersion) { if (Local::oldMapVersion()) { QString versionFeatures; - if (cDevVersion() && Local::oldMapVersion() < 8053) { - versionFeatures = QString::fromUtf8("\xe2\x80\x94 Include muted chats in unread count in Settings\n\xe2\x80\x94 Shared links overview and search in shared media");// .replace('@', qsl("@") + QChar(0x200D)); + if (cDevVersion() && Local::oldMapVersion() < 8054) { + versionFeatures = QString::fromUtf8("\xe2\x80\x94 Preview when sending links to GIF animations and PDF files\n\xe2\x80\x94 Full date and time shown when mouse over message timestamp");// .replace('@', qsl("@") + QChar(0x200D)); } else if (!cDevVersion() && Local::oldMapVersion() < 8052) { versionFeatures = lang(lng_new_version_minor).trimmed(); } diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 974c4127d..b2492e83a 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 = 8053; -static const wchar_t *AppVersionStr = L"0.8.53"; +static const int32 AppVersion = 8054; +static const wchar_t *AppVersionStr = L"0.8.54"; static const bool DevVersion = true; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 1388c2cee..e58301e7b 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -348,7 +348,7 @@ bool History::updateTyping(uint64 ms, uint32 dots, bool force) { ++i; } } - for (SendActionUsers::iterator i = sendActions.begin(), e = sendActions.end(); i != e;) { + for (SendActionUsers::iterator i = sendActions.begin(); i != sendActions.cend();) { if (ms >= i.value().until) { i = sendActions.erase(i); changed = true; diff --git a/Telegram/SourceFiles/pspecific_wnd.cpp b/Telegram/SourceFiles/pspecific_wnd.cpp index 76e48f978..3cba849fe 100644 --- a/Telegram/SourceFiles/pspecific_wnd.cpp +++ b/Telegram/SourceFiles/pspecific_wnd.cpp @@ -2809,9 +2809,6 @@ bool CreateToast(PeerData *peer, int32 msgId, bool showpix, const QString &title if (j != i->cend()) { toastNotifier->Hide(j->p.Get()); i->erase(j); - if (i->isEmpty()) { - toastNotifications.erase(i); - } } } hr = toastNotifier->Show(toast.Get()); diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 7f3e9f0de..21b7a0cf4 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.8.53 + 0.8.54 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) CFBundleSignature diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 175bf43784430732ef122a4d7f08097a35163306..41823dcc2334b4ea61b066fe7fa61d553aba0e98 100644 GIT binary patch delta 53 zcmZ3Yy+nIM5ig_3