From f96b7da7ce92440b1c72fb9eb3d29a0f33160a12 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 1 Apr 2016 00:36:46 +0400 Subject: [PATCH] Crash reporting fixed, radial progress fixed. 0.9.38 dev version. --- Telegram/SourceFiles/config.h | 4 ++-- Telegram/SourceFiles/history.cpp | 3 +-- Telegram/SourceFiles/logs.cpp | 10 +++++----- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | 8 ++++---- Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version | 6 +++--- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 432abb6df..c8a83ff05 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -20,8 +20,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 9037; -static const wchar_t *AppVersionStr = L"0.9.37"; +static const int32 AppVersion = 9038; +static const wchar_t *AppVersionStr = L"0.9.38"; static const bool DevVersion = true; //#define BETA_VERSION (9034004ULL) // just comment this line to build public version diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 9aa63c654..bbfb98731 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -3046,8 +3046,7 @@ void RadialAnimation::update(float64 prg, bool finished, uint64 ms) { _opacity *= 1 - r; } float64 fromstart = fulldt / st::radialPeriod; - float64 fromstartpart = fromstart - std::floor(fromstart); - a_arcStart.update(static_cast(fromstartpart), anim::linear); + a_arcStart.update(fromstart - std::floor(fromstart), anim::linear); } void RadialAnimation::stop() { diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp index c57528911..668990da2 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -1080,18 +1080,18 @@ namespace internal { } void setCrashAnnotation(const std::string &key, const QString &value) { - if (value.trimmed().isEmpty()) { - internal::ProcessAnnotations.erase(key); - } else { + if (!value.trimmed().isEmpty()) { internal::ProcessAnnotations[key] = value.toUtf8().constData(); + } else { + internal::ProcessAnnotations.erase(key); } } void setCrashAnnotationRef(const std::string &key, const QString *valuePtr) { if (valuePtr) { - internal::ProcessAnnotationRefs.erase(key); - } else { internal::ProcessAnnotationRefs[key] = valuePtr; + } else { + internal::ProcessAnnotationRefs.erase(key); } } diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index e697ce59e..3cb7a80d9 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.37 + 0.9.38 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index c3b1412a0..dc73d5daa 100644 --- a/Telegram/Telegram.rc +++ b/Telegram/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "SourceFiles\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,37,0 - PRODUCTVERSION 0,9,37,0 + FILEVERSION 0,9,38,0 + PRODUCTVERSION 0,9,38,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.9.37.0" + VALUE "FileVersion", "0.9.38.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.37.0" + VALUE "ProductVersion", "0.9.38.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 5b81e5f17..8f77b8522 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1772,7 +1772,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.37; + CURRENT_PROJECT_VERSION = 0.9.38; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1791,7 +1791,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.9.37; + CURRENT_PROJECT_VERSION = 0.9.38; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1820,10 +1820,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.37; + CURRENT_PROJECT_VERSION = 0.9.38; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 0.9; - DYLIB_CURRENT_VERSION = 0.9.37; + DYLIB_CURRENT_VERSION = 0.9.38; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1961,10 +1961,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.37; + CURRENT_PROJECT_VERSION = 0.9.38; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.9; - DYLIB_CURRENT_VERSION = 0.9.37; + DYLIB_CURRENT_VERSION = 0.9.38; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ""; diff --git a/Telegram/Version b/Telegram/Version index 6c83176cd..59825138f 100644 --- a/Telegram/Version +++ b/Telegram/Version @@ -1,6 +1,6 @@ -AppVersion 9037 +AppVersion 9038 AppVersionStrMajor 0.9 -AppVersionStrSmall 0.9.37 -AppVersionStr 0.9.37 +AppVersionStrSmall 0.9.38 +AppVersionStr 0.9.38 DevChannel 1 BetaVersion 0 9034004