version 0.8.54.dev prepared, two crash fixes

kevinmel2000 · Aug 31, 2015 · 25b6740 · 25b6740
1 parent a0f7a46
commit 25b6740
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,7 +11,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.53</string>
+	<string>0.8.54</string>
         <key>LSMinimumSystemVersion</key>
         <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>CFBundleSignature</key>

diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1707,7 +1707,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.8.53;
+				CURRENT_PROJECT_VERSION = 0.8.54;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1725,7 +1725,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.8.53;
+				CURRENT_PROJECT_VERSION = 0.8.54;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1751,10 +1751,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.8.53;
+				CURRENT_PROJECT_VERSION = 0.8.54;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 0.8;
-				DYLIB_CURRENT_VERSION = 0.8.53;
+				DYLIB_CURRENT_VERSION = 0.8.54;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1885,10 +1885,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.8.53;
+				CURRENT_PROJECT_VERSION = 0.8.54;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.8;
-				DYLIB_CURRENT_VERSION = 0.8.53;
+				DYLIB_CURRENT_VERSION = 0.8.54;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

diff --git a/Telegram/Version.sh b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 0.8 8053 0.8.53 1
+echo 0.8 8054 0.8.54 1
 # AppVersionStrMajor AppVersion AppVersionStr DevChannel