From 6d8f277904ea2442b4ec61c91d430345577eaeed Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 4 Jun 2015 16:04:34 +0300 Subject: [PATCH] version 0.8.22.dev prepared - new OpenAL version, new Auto-Update (no temp -> ready rename), some fixes --- Telegram/PrepareWin.bat | 8 ++++---- Telegram/SourceFiles/application.cpp | 4 +--- Telegram/SourceFiles/autoupdater.cpp | 2 +- Telegram/SourceFiles/config.h | 4 ++-- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5540 -> 5540 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Updater.rc | Bin 4370 -> 4370 bytes Telegram/Version.sh | 2 +- 9 files changed, 16 insertions(+), 18 deletions(-) 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 234db8af4dc6efa6145055bb17b4e506a5e3be1b..a8b0b5c3af4c5528882ccdb8b47ff4c7fe0d2873 100644 GIT binary patch delta 53 zcmZ3Yy+nIM5ig_B