From f5259b58e5b8b7a4252b48ac4ba41d5619bfdc6b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 Jul 2015 13:32:33 +0300
Subject: [PATCH] fixed bug in dev -> stable update, version 0.8.42.dev

---
 Telegram/PrepareWin.bat                     |  10 +++++-----
 Telegram/SourceFiles/config.h               |   6 +++---
 Telegram/SourceFiles/main.cpp               |   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, 18 insertions(+), 18 deletions(-)

diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
index 04bd71215..793a4a948 100644
--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,11 +1,11 @@
 @echo OFF
 
 set "AppVersionStrMajor=0.8"
-set "AppVersion=8043"
-set "AppVersionStrSmall=0.8.43"
-set "AppVersionStr=0.8.43"
-set "AppVersionStrFull=0.8.43.0"
-set "DevChannel=0"
+set "AppVersion=8042"
+set "AppVersionStrSmall=0.8.42"
+set "AppVersionStr=0.8.42"
+set "AppVersionStrFull=0.8.42.0"
+set "DevChannel=1"
 
 if %DevChannel% neq 0 goto preparedev
 
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index e4f6476b7..5215beaf0 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -17,9 +17,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-static const int32 AppVersion = 8043;
-static const wchar_t *AppVersionStr = L"0.8.43";
-static const bool DevVersion = false;
+static const int32 AppVersion = 8042;
+static const wchar_t *AppVersionStr = L"0.8.42";
+static const bool DevVersion = true;
 
 static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
 static const wchar_t *AppName = L"Telegram Desktop";
diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
index c1034ca0e..e282a889b 100644
--- a/Telegram/SourceFiles/main.cpp
+++ b/Telegram/SourceFiles/main.cpp
@@ -80,8 +80,8 @@ int main(int argc, char *argv[]) {
 
 	if (cRestartingUpdate()) {
 		if (DevVersion) {
-			LOG(("Writing 'withdebug' file before launching the Updater!"));
-			QFile f(cWorkingDir() + qsl("tdata/withdebug"));
+			LOG(("Writing 'devversion' file before launching the Updater!"));
+			QFile f(cWorkingDir() + qsl("tdata/devversion"));
 			if (!f.exists() && f.open(QIODevice::WriteOnly)) {
 				f.write("1");
 				f.close();
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index e13565542..72088f0df 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.43</string>
+	<string>0.8.42</string>
         <key>LSMinimumSystemVersion</key>
         <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>CFBundleSignature</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index e61aa8e03cf8c5391d3f7fcddd28faae10c2faa5..03fbda89e5b4e9378d4b8d93dc94a6e83a6de0cc 100644
GIT binary patch
delta 53
zcmZ3Yy+nIM5ig_B<YHc9Mx)Kkc_%Wl8ZqcG7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d+
CHx7CL

delta 53
zcmZ3Yy+nIM5ig_h<YHc9M&r%Pc_%Wl8Z+oI7);(Mpu0IsfQJ#z6`#CBP-yWIK^6d+
CybgW<

diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index af3c1dec2..383225818 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.43;
+				CURRENT_PROJECT_VERSION = 0.8.42;
 				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.43;
+				CURRENT_PROJECT_VERSION = 0.8.42;
 				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.43;
+				CURRENT_PROJECT_VERSION = 0.8.42;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 0.8;
-				DYLIB_CURRENT_VERSION = 0.8.43;
+				DYLIB_CURRENT_VERSION = 0.8.42;
 				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.43;
+				CURRENT_PROJECT_VERSION = 0.8.42;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.8;
-				DYLIB_CURRENT_VERSION = 0.8.43;
+				DYLIB_CURRENT_VERSION = 0.8.42;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index b370f5f6a..35b2893ac 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 0.8 8043 0.8.43 0
+echo 0.8 8042 0.8.42 1
 # AppVersionStrMajor AppVersion AppVersionStr DevChannel