diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index c55dad70ad..eba87711c7 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,9 +1,9 @@ @echo OFF -set "AppVersion=8024" -set "AppVersionStrSmall=0.8.24" -set "AppVersionStr=0.8.24" -set "AppVersionStrFull=0.8.24.0" +set "AppVersion=8022" +set "AppVersionStrSmall=0.8.22" +set "AppVersionStr=0.8.22" +set "AppVersionStrFull=0.8.22.0" set "DevChannel=1" if %DevChannel% neq 0 goto preparedev diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index a59e5e4be6..d1156aa514 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -640,10 +640,8 @@ void Application::checkMapVersion() { psRegisterCustomScheme(); if (Local::oldMapVersion()) { QString versionFeatures; - if (DevChannel && Local::oldMapVersion() < 8020) { + if (DevChannel && Local::oldMapVersion() < 8022) { versionFeatures = lang(lng_new_version_minor).trimmed();// QString::fromUtf8("\xe2\x80\x94 Video captions are displayed\n\xe2\x80\x94 Photo captions are displayed in photo viewer\n\xe2\x80\x94 Round corners for messages").replace('@', qsl("@") + QChar(0x200D)); - } else if (!DevChannel && Local::oldMapVersion() < 8016) { - versionFeatures = lang(lng_new_version_text).trimmed(); } else if (!DevChannel && Local::oldMapVersion() < 8021) { versionFeatures = lang(lng_new_version_text).trimmed(); } diff --git a/Telegram/SourceFiles/autoupdater.cpp b/Telegram/SourceFiles/autoupdater.cpp index 6647aa8706..ec8f7fcf62 100644 --- a/Telegram/SourceFiles/autoupdater.cpp +++ b/Telegram/SourceFiles/autoupdater.cpp @@ -441,7 +441,7 @@ 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 + if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists() || QDir(cWorkingDir() + qsl("tupdates/temp")).exists()) { UpdateDownloader::clearAll(); } return false; diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index a14a5c58db..22a9a54f53 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 = 8024; -static const wchar_t *AppVersionStr = L"0.8.24"; +static const int32 AppVersion = 8022; +static const wchar_t *AppVersionStr = L"0.8.22"; 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 0ba654895a..1c11dcb568 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.8.24 + 0.8.22 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) CFBundleSignature diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 234db8af4d..a8b0b5c3af 100644 Binary files a/Telegram/Telegram.rc and b/Telegram/Telegram.rc differ diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 455a6b7e8e..4d035c68e7 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.24; + CURRENT_PROJECT_VERSION = 0.8.22; 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.24; + CURRENT_PROJECT_VERSION = 0.8.22; 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.24; + CURRENT_PROJECT_VERSION = 0.8.22; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 0.8; - DYLIB_CURRENT_VERSION = 0.8.24; + DYLIB_CURRENT_VERSION = 0.8.22; 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.24; + CURRENT_PROJECT_VERSION = 0.8.22; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.8; - DYLIB_CURRENT_VERSION = 0.8.24; + DYLIB_CURRENT_VERSION = 0.8.22; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; diff --git a/Telegram/Updater.rc b/Telegram/Updater.rc index 0dc8c28151..0a3c12aa21 100644 Binary files a/Telegram/Updater.rc and b/Telegram/Updater.rc differ diff --git a/Telegram/Version.sh b/Telegram/Version.sh index 0d504416e3..885e69b13a 100755 --- a/Telegram/Version.sh +++ b/Telegram/Version.sh @@ -1,2 +1,2 @@ -echo 8024 0.8.24 1 +echo 8022 0.8.22 1 # AppVersion AppVersionStr DevChannel