From 1c50c35abe822f5709eb280ee69a731b16879cd8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Jun 2015 13:54:56 +0300
Subject: [PATCH] 0.8.23.dev test (not production!) version ready, autoupdater
 cleaning old ready dir

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

diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
index eba87711c..a291fa2f2 100644
--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,9 +1,9 @@
 @echo OFF
 
-set "AppVersion=8022"
-set "AppVersionStrSmall=0.8.22"
-set "AppVersionStr=0.8.22"
-set "AppVersionStrFull=0.8.22.0"
+set "AppVersion=8023"
+set "AppVersionStrSmall=0.8.23"
+set "AppVersionStr=0.8.23"
+set "AppVersionStrFull=0.8.23.0"
 set "DevChannel=1"
 
 if %DevChannel% neq 0 goto preparedev
diff --git a/Telegram/SourceFiles/autoupdater.cpp b/Telegram/SourceFiles/autoupdater.cpp
index 73002780a..6647aa870 100644
--- a/Telegram/SourceFiles/autoupdater.cpp
+++ b/Telegram/SourceFiles/autoupdater.cpp
@@ -441,6 +441,9 @@ UpdateDownloader::~UpdateDownloader() {
 bool checkReadyUpdate() {
 	QString readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready"), readyPath = cWorkingDir() + qsl("tupdates/temp");
 	if (!QFile(readyFilePath).exists()) {
+		if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists()) { // old dir after elevated update
+			UpdateDownloader::clearAll();
+		}
 		return false;
 	}
 
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 22a9a54f5..1da5bd352 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 = 8022;
-static const wchar_t *AppVersionStr = L"0.8.22";
+static const int32 AppVersion = 8023;
+static const wchar_t *AppVersionStr = L"0.8.23";
 static const bool DevChannel = true;
 
 static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 1c11dcb56..b0a2b66e0 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.22</string>
+	<string>0.8.23</string>
         <key>LSMinimumSystemVersion</key>
         <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>CFBundleSignature</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index a8b0b5c3af4c5528882ccdb8b47ff4c7fe0d2873..30e84033c84ffc9174d2fed5d2b22525daf73927 100644
GIT binary patch
delta 53
zcmZ3Yy+nIM5ig_h<YHc9M&r%Pc_%Wl8Z+oI7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d+
CybgW<

delta 53
zcmZ3Yy+nIM5ig_B<YHc9Mx)Kkc_%Wl8ZqcG7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d+
CHx7CL

diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index 4d035c68e..ee4fec491 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1703,7 +1703,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.8.22;
+				CURRENT_PROJECT_VERSION = 0.8.23;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1721,7 +1721,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.8.22;
+				CURRENT_PROJECT_VERSION = 0.8.23;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1747,10 +1747,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.8.22;
+				CURRENT_PROJECT_VERSION = 0.8.23;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 0.8;
-				DYLIB_CURRENT_VERSION = 0.8.22;
+				DYLIB_CURRENT_VERSION = 0.8.23;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1890,10 +1890,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.8.22;
+				CURRENT_PROJECT_VERSION = 0.8.23;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.8;
-				DYLIB_CURRENT_VERSION = 0.8.22;
+				DYLIB_CURRENT_VERSION = 0.8.23;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index 885e69b13..15a6aad72 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 8022 0.8.22 1
+echo 8023 0.8.23 1
 # AppVersion AppVersionStr DevChannel