From b82adc761019bf3e143bb331b4a9cf84abed21f8 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 4 Jan 2016 22:00:37 +0800 Subject: [PATCH] fixed crash, 0.9.17 version --- Telegram/SourceFiles/config.h | 4 ++-- Telegram/SourceFiles/history.cpp | 2 +- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | 8 ++++---- Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index e41af8366..c3ebc7486 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -20,8 +20,8 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 9016; -static const wchar_t *AppVersionStr = L"0.9.16"; +static const int32 AppVersion = 9017; +static const wchar_t *AppVersionStr = L"0.9.17"; static const bool DevVersion = false; //#define BETA_VERSION (9015008ULL) // just comment this line to build public version diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 2096bd247..8adc6896b 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -7022,7 +7022,7 @@ void HistoryReply::initDimensions() { if (!_media) { int32 replyw = st::msgPadding.left() + _maxReplyWidth - st::msgReplyPadding.left() - st::msgReplyPadding.right() + st::msgPadding.right(); if (replyToVia()) { - replyw += st::msgServiceFont->spacew + via()->maxWidth; + replyw += st::msgServiceFont->spacew + replyToVia()->maxWidth; } if (replyw > _maxw) _maxw = replyw; } diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 544089e81..1ce05ba2a 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.16 + 0.9.17 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 934f5c678..b4ef2e97d 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,16,0 - PRODUCTVERSION 0,9,16,0 + FILEVERSION 0,9,17,0 + PRODUCTVERSION 0,9,17,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.9.16.0" + VALUE "FileVersion", "0.9.17.0" VALUE "LegalCopyright", "Copyright (C) 2013" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.16.0" + VALUE "ProductVersion", "0.9.17.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index c8738b710..6716e5cc2 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1701,7 +1701,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.16; + CURRENT_PROJECT_VERSION = 0.9.17; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1720,7 +1720,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.9.16; + CURRENT_PROJECT_VERSION = 0.9.17; 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.9.16; + CURRENT_PROJECT_VERSION = 0.9.17; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 0.9; - DYLIB_CURRENT_VERSION = 0.9.16; + DYLIB_CURRENT_VERSION = 0.9.17; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1882,10 +1882,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.9.16; + CURRENT_PROJECT_VERSION = 0.9.17; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.9; - DYLIB_CURRENT_VERSION = 0.9.16; + DYLIB_CURRENT_VERSION = 0.9.17; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ""; diff --git a/Telegram/Version b/Telegram/Version index 8f5c67a00..38e8f55ba 100644 --- a/Telegram/Version +++ b/Telegram/Version @@ -1,6 +1,6 @@ -AppVersion 9016 +AppVersion 9017 AppVersionStrMajor 0.9 -AppVersionStrSmall 0.9.16 -AppVersionStr 0.9.16 +AppVersionStrSmall 0.9.17 +AppVersionStr 0.9.17 DevChannel 0 BetaVersion 0 9015008