From fc73ff2ea0ef546177e92cf4484fa79b51640d88 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 13 Dec 2014 02:34:50 +0300
Subject: [PATCH] fixed critical bug in msg forward - 0.6.20
---
Telegram/PrepareWin.bat | 6 +++---
Telegram/SourceFiles/config.h | 6 +++---
Telegram/SourceFiles/main.cpp | 2 +-
Telegram/SourceFiles/mainwidget.cpp | 2 +-
Telegram/Telegram.plist | 2 +-
Telegram/Telegram.rc | Bin 5540 -> 5540 bytes
Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------
Telegram/Version.sh | 2 +-
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
index 96c131b629..ae04a57e92 100644
--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,8 +1,8 @@
@echo OFF
-set "AppVersionStrSmall=0.6.19"
-set "AppVersionStr=0.6.19"
-set "AppVersionStrFull=0.6.19.0"
+set "AppVersionStrSmall=0.6.20"
+set "AppVersionStr=0.6.20"
+set "AppVersionStrFull=0.6.20.0"
echo.
echo Preparing version %AppVersionStr%..
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 081ae59902..bb23a6469c 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 = 6019;
-static const wchar_t *AppVersionStr = L"0.6.19";
+static const int32 AppVersion = 6020;
+static const wchar_t *AppVersionStr = L"0.6.20";
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
static const wchar_t *AppName = L"Telegram Desktop";
@@ -26,7 +26,7 @@ static const wchar_t *AppName = L"Telegram Desktop";
static const wchar_t *AppId = L"{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"; // used in updater.cpp and Setup.iss for Windows
static const wchar_t *AppFile = L"Telegram";
-static const int32 FeaturesNotifyVersion = 6019;
+static const int32 FeaturesNotifyVersion = 6020;
static const int32 FeaturesNotifyVersionFrom = 6017;
extern const char *FeaturesNotify;
diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
index 56900ac430..0d9f138bf5 100644
--- a/Telegram/SourceFiles/main.cpp
+++ b/Telegram/SourceFiles/main.cpp
@@ -20,7 +20,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
#include "pspecific.h"
const char *FeaturesNotify = "\
-Telegram Desktop was updated to version 0.6.18\n\
+Telegram Desktop was updated to version 0.6.20\n\
\n\
\xe2\x80\x94 Single-column layout support added for small chat window.\n\
\xe2\x80\x94 Photos are sent up to 1280x1280 size.\n\
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index aa5edf9f32..1c92c05da6 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -452,7 +452,7 @@ void MainWidget::offerPeer(PeerId peer) {
void MainWidget::onForwardCancel(QObject *obj) {
if (!obj || obj == _forwardConfirm) {
if (_forwardConfirm) {
- _forwardConfirm->startHide();
+ if (!obj) _forwardConfirm->startHide();
_forwardConfirm = 0;
}
if (hider) hider->offerPeer(0);
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index e010ceac51..5a8081b15a 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.6.19</string>
+ <string>0.6.20</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index e0c0581a5cc268a18d02a8e71bf6b66ef7bf5115..e0ce2af0592256fbc1b41e71387ef847b2091b8e 100644
GIT binary patch
delta 61
zcmZ3Yy+nIM0WY%=gTdrtUPBPQc{y)C6FZQ>pa&G(D4@GJOMr_JNkDw^5<#KGO9WW}
D<eLvV
delta 61
zcmZ3Yy+nIM0WY&5gT>@xUPBPQc{y)C6FZQ>pvPb^d82^t<}3j&MkE38$x8%<7B3NG
F0RZTV4^{vG
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index b9d862bf87..c6a9075dcb 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1577,7 +1577,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.6.19;
+ CURRENT_PROJECT_VERSION = 0.6.20;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1595,7 +1595,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 0.6.19;
+ CURRENT_PROJECT_VERSION = 0.6.20;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1621,10 +1621,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.6.19;
+ CURRENT_PROJECT_VERSION = 0.6.20;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.6;
- DYLIB_CURRENT_VERSION = 0.6.19;
+ DYLIB_CURRENT_VERSION = 0.6.20;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1764,10 +1764,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.6.19;
+ CURRENT_PROJECT_VERSION = 0.6.20;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.6;
- DYLIB_CURRENT_VERSION = 0.6.19;
+ DYLIB_CURRENT_VERSION = 0.6.20;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/Telegram/Version.sh b/Telegram/Version.sh
index b4d354701e..bbfd154ad0 100755
--- a/Telegram/Version.sh
+++ b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 6019 0.6.19
+echo 6020 0.6.20