From a83700f9434a23bb31676420ef332fccf8c364ff Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 22 Nov 2015 16:24:17 +0300
Subject: [PATCH] crash fixed, 0.9.12 dev

---
 Telegram/SourceFiles/localstorage.cpp       |  16 +++++++++++-----
 Telegram/Telegram.plist                     |   2 +-
 Telegram/Telegram.rc                        | Bin 5540 -> 5540 bytes
 Telegram/Telegram.xcodeproj/project.pbxproj |  12 ++++++------
 Telegram/Version                            |   6 +++---
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/localstorage.cpp b/Telegram/SourceFiles/localstorage.cpp
index 30c35cc11..0a719aa7f 100644
--- a/Telegram/SourceFiles/localstorage.cpp
+++ b/Telegram/SourceFiles/localstorage.cpp
@@ -2948,7 +2948,7 @@ namespace Local {
 			result += _stringSize(user->firstName) + _stringSize(user->lastName) + _stringSize(user->phone) + _stringSize(user->username) + sizeof(quint64);
 
 			// flags
-			if (AppVersion >= 9009) {
+			if (AppVersion >= 9012) {
 				result += sizeof(qint32);
 			}
 
@@ -2975,14 +2975,14 @@ namespace Local {
 			UserData *user = peer->asUser();
 
 			stream << user->firstName << user->lastName << user->phone << user->username << quint64(user->access);
-			if (AppVersion >= 9009) {
+			if (AppVersion >= 9012) {
 				stream << qint32(user->flags);
 			}
 			stream << qint32(user->onlineTill) << qint32(user->contact) << qint32(user->botInfo ? user->botInfo->version : -1);
 		} else if (peer->isChat()) {
 			ChatData *chat = peer->asChat();
 
-			qint32 flagsData = (AppVersion >= 9009) ? chat->flags : (chat->haveLeft() ? 1 : 0);
+			qint32 flagsData = (AppVersion >= 9012) ? chat->flags : (chat->haveLeft() ? 1 : 0);
 
 			stream << chat->name << qint32(chat->count) << qint32(chat->date) << qint32(chat->version) << qint32(chat->creator);
 			stream << qint32(chat->isForbidden ? 1 : 0) << qint32(flagsData) << chat->invitationUrl;
@@ -3010,7 +3010,7 @@ namespace Local {
 			quint64 access;
 			qint32 flags = 0, onlineTill, contact, botInfoVersion;
 			from.stream >> first >> last >> phone >> username >> access;
-			if (from.version >= 9009) {
+			if (from.version >= 9012) {
 				from.stream >> flags;
 			}
 			from.stream >> onlineTill >> contact >> botInfoVersion;
@@ -3042,7 +3042,7 @@ namespace Local {
 			qint32 count, date, version, creator, forbidden, flagsData, flags;
 			from.stream >> name >> count >> date >> version >> creator >> forbidden >> flagsData >> invitationUrl;
 
-			if (from.version >= 9009) {
+			if (from.version >= 9012) {
 				flags = flagsData;
 			} else {
 				// flagsData was haveLeft
@@ -3131,6 +3131,12 @@ namespace Local {
 			_writeMap();
 			return;
 		}
+		if (saved.version == 9011) { // broken dev version
+			clearKey(_savedPeersKey);
+			_savedPeersKey = 0;
+			_writeMap();
+			return;
+		}
 
 		quint32 count = 0;
 		saved.stream >> count;
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 1664aecb9..28a67bd69 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.11</string>
+	<string>0.9.12</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index c736ff3a42305162b8546c93fd8b7b21de11360e..c7a336325a5930354488292dbab93023917beb97 100644
GIT binary patch
delta 53
zcmZ3Yy+nIM5ig_B<YHc9Mx)Kkc_%Wl8ZqcG7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d+
CHx7CL

delta 53
zcmZ3Yy+nIM5ig_R<YHc9M#Ig^c_%Wl8ZziH7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d*
CvJQ3t

diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index d88b91754..68612c70c 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1687,7 +1687,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.9.11;
+				CURRENT_PROJECT_VERSION = 0.9.12;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1706,7 +1706,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.9.11;
+				CURRENT_PROJECT_VERSION = 0.9.12;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1733,10 +1733,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.9.11;
+				CURRENT_PROJECT_VERSION = 0.9.12;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 0.9;
-				DYLIB_CURRENT_VERSION = 0.9.11;
+				DYLIB_CURRENT_VERSION = 0.9.12;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1867,10 +1867,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.9.11;
+				CURRENT_PROJECT_VERSION = 0.9.12;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.9;
-				DYLIB_CURRENT_VERSION = 0.9.11;
+				DYLIB_CURRENT_VERSION = 0.9.12;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
diff --git a/Telegram/Version b/Telegram/Version
index 83d330408..e0f7d0a21 100644
--- a/Telegram/Version
+++ b/Telegram/Version
@@ -1,5 +1,5 @@
-AppVersion         9011
+AppVersion         9012
 AppVersionStrMajor 0.9
-AppVersionStrSmall 0.9.11
-AppVersionStr      0.9.11
+AppVersionStrSmall 0.9.12
+AppVersionStr      0.9.12
 DevChannel         1