From de230332b95a9cb786bc141fa4df32be0b756897 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 3 Oct 2019 19:49:59 +0300 Subject: [PATCH] Version 1.8.14: Fix crash in text processing on old OS X. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/SourceFiles/ui/text/text.cpp | 16 ++++++++++------ Telegram/build/version | 6 +++--- changelog.txt | 4 ++++ 7 files changed, 28 insertions(+), 20 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 530165669..5281fcb22 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.8.14.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index a605dd0f9..2ea805229 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -33,8 +33,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,8,13,0 - PRODUCTVERSION 1,8,13,0 + FILEVERSION 1,8,14,0 + PRODUCTVERSION 1,8,14,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.8.13.0" + VALUE "FileVersion", "1.8.14.0" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.8.13.0" + VALUE "ProductVersion", "1.8.14.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index bc05c7140..6e3a1c18a 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,8,13,0 - PRODUCTVERSION 1,8,13,0 + FILEVERSION 1,8,14,0 + PRODUCTVERSION 1,8,14,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -42,10 +42,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.8.13.0" + VALUE "FileVersion", "1.8.14.0" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.8.13.0" + VALUE "ProductVersion", "1.8.14.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 32f5657dd..a37424e1a 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #define TDESKTOP_ALPHA_VERSION (0ULL) #endif // TDESKTOP_OFFICIAL_TARGET -constexpr auto AppVersion = 1008013; -constexpr auto AppVersionStr = "1.8.13"; +constexpr auto AppVersion = 1008014; +constexpr auto AppVersionStr = "1.8.14"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp index 7891995be..cc865eace 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp @@ -118,14 +118,18 @@ bool ComputeCheckTilde(const style::TextStyle &st) { bool chIsBad(QChar ch) { return (ch == 0) - || (ch >= 8232 && ch < 8237) - || (ch >= 65024 && ch < 65040 && ch != 65039) - || (ch >= 127 && ch < 160 && ch != 156) + || (ch >= 8232 && ch < 8237) + || (ch >= 65024 && ch < 65040 && ch != 65039) + || (ch >= 127 && ch < 160 && ch != 156) - // qt harfbuzz crash see https://github.com/telegramdesktop/tdesktop/issues/4551 - || (Platform::IsMac() && ch == 6158) + // qt harfbuzz crash see https://github.com/telegramdesktop/tdesktop/issues/4551 + || (Platform::IsMac() && ch == 6158) - // tmp hack see https://bugreports.qt.io/browse/QTBUG-48910 + || (Platform::IsMac() + && !Platform::IsMac10_7OrGreater() + && (ch == 8207 || ch == 8206 || ch == 8288)) + + // tmp hack see https://bugreports.qt.io/browse/QTBUG-48910 || (Platform::IsMac10_11OrGreater() && !Platform::IsMac10_12OrGreater() && ch >= 0x0B00 diff --git a/Telegram/build/version b/Telegram/build/version index aec94f196..5572a2b64 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1008013 +AppVersion 1008014 AppVersionStrMajor 1.8 -AppVersionStrSmall 1.8.13 -AppVersionStr 1.8.13 +AppVersionStrSmall 1.8.14 +AppVersionStr 1.8.14 BetaChannel 0 AlphaVersion 0 diff --git a/changelog.txt b/changelog.txt index b7f97921a..1e82844b8 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +1.8.14 (03.10.19) + +- Bug fixes and other minor improvements. + 1.8.13 (03.10.19) - Bug fixes and other minor improvements.