From 6225bd3bcb536363395a1fec3d3b094485b42259 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Aug 2015 16:48:27 +0300
Subject: [PATCH] fixed crash on sticker send, version 0.8.46

---
 Telegram/PrepareWin.bat                     |   8 ++++----
 Telegram/SourceFiles/config.h               |   4 ++--
 Telegram/SourceFiles/historywidget.cpp      |   2 +-
 Telegram/Telegram.plist                     |   2 +-
 Telegram/Telegram.rc                        | Bin 5540 -> 5540 bytes
 Telegram/Telegram.xcodeproj/project.pbxproj |  12 ++++++------
 Telegram/Version.sh                         |   2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
index a77e54d54..0ccb9abc5 100644
--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,10 +1,10 @@
 @echo OFF
 
 set "AppVersionStrMajor=0.8"
-set "AppVersion=8045"
-set "AppVersionStrSmall=0.8.45"
-set "AppVersionStr=0.8.45"
-set "AppVersionStrFull=0.8.45.0"
+set "AppVersion=8046"
+set "AppVersionStrSmall=0.8.46"
+set "AppVersionStr=0.8.46"
+set "AppVersionStrFull=0.8.46.0"
 set "DevChannel=0"
 
 if %DevChannel% neq 0 goto preparedev
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 83e9f9f2d..377fea046 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 = 8045;
-static const wchar_t *AppVersionStr = L"0.8.45";
+static const int32 AppVersion = 8046;
+static const wchar_t *AppVersionStr = L"0.8.46";
 static const bool DevVersion = false;
 
 static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp
index 32ce0a65d..41f9b538e 100644
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@@ -4381,7 +4381,7 @@ void HistoryWidget::onDocumentProgress(MsgId newId) {
 	HistoryItem *item = App::histItemById(newId);
 	if (item) {
 		DocumentData *doc = (item->getMedia() && item->getMedia()->type() == MediaTypeDocument) ? static_cast<HistoryDocument*>(item->getMedia())->document() : 0;
-		updateSendAction(item->history(), SendActionUploadFile, doc->uploadOffset);
+		updateSendAction(item->history(), SendActionUploadFile, doc ? doc->uploadOffset : 0);
 		msgUpdated(item->history()->peer->id, item);
 	}
 }
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index a5a04007b..745d81e8e 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.45</string>
+	<string>0.8.46</string>
         <key>LSMinimumSystemVersion</key>
         <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>CFBundleSignature</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index c407394adde408a40c3d1f587915737da69103d2..dee5d4b5f7d0cfaf265e476220a164294dd29cb2 100644
GIT binary patch
delta 53
zcmZ3Yy+nIM5ig_J<YHc9MzhV!c_%Wlnlb1x7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d;
COAd+v

delta 53
zcmZ3Yy+nIM5ig_Z<YHc9M$^s9c_%Wlnlk7y7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d-
C#tw!6

diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index 3bb07489c..175b9d219 100644
--- 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.45;
+				CURRENT_PROJECT_VERSION = 0.8.46;
 				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.45;
+				CURRENT_PROJECT_VERSION = 0.8.46;
 				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.45;
+				CURRENT_PROJECT_VERSION = 0.8.46;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 0.8;
-				DYLIB_CURRENT_VERSION = 0.8.45;
+				DYLIB_CURRENT_VERSION = 0.8.46;
 				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.45;
+				CURRENT_PROJECT_VERSION = 0.8.46;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.8;
-				DYLIB_CURRENT_VERSION = 0.8.45;
+				DYLIB_CURRENT_VERSION = 0.8.46;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index c0c00636d..8f625316a 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 0.8 8045 0.8.45 0
+echo 0.8 8046 0.8.46 0
 # AppVersionStrMajor AppVersion AppVersionStr DevChannel