Version 1.3.7: Fix file dialog parent widget.

Regression was introduced in 67ea175fc6. Fixes #4817.
Version 1.3.7: Possible bug fix.
2018-06-11 23:40:30 +03:00 · 2018-06-11 22:31:44 +03:00 · 2018-06-11 22:28:34 +03:00
8 changed files with 28 additions and 18 deletions
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
  <Identity Name="TelegramMessengerLLP.TelegramDesktop"
    ProcessorArchitecture="ARCHITECTURE"
    Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="1.3.6.0" />
+    Version="1.3.7.0" />
  <Properties>
    <DisplayName>Telegram Desktop</DisplayName>
    <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,6,0
- PRODUCTVERSION 1,3,6,0
+ FILEVERSION 1,3,7,0
+ PRODUCTVERSION 1,3,7,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -52,10 +52,10 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Telegram Messenger LLP"
            VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "1.3.6.0"
+            VALUE "FileVersion", "1.3.7.0"
            VALUE "LegalCopyright", "Copyright (C) 2014-2018"
            VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.3.6.0"
+            VALUE "ProductVersion", "1.3.7.0"
        END
    END
    BLOCK "VarFileInfo"
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,6,0
- PRODUCTVERSION 1,3,6,0
+ FILEVERSION 1,3,7,0
+ PRODUCTVERSION 1,3,7,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Telegram Messenger LLP"
            VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "1.3.6.0"
+            VALUE "FileVersion", "1.3.7.0"
            VALUE "LegalCopyright", "Copyright (C) 2014-2018"
            VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.3.6.0"
+            VALUE "ProductVersion", "1.3.7.0"
        END
    END
    BLOCK "VarFileInfo"
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL

 #define BETA_VERSION_MACRO (0ULL)

-constexpr int AppVersion = 1003006;
-constexpr str_const AppVersionStr = "1.3.6";
-constexpr bool AppAlphaVersion = true;
+constexpr int AppVersion = 1003007;
+constexpr str_const AppVersionStr = "1.3.7";
+constexpr bool AppAlphaVersion = false;
 constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -199,6 +199,9 @@ bool Get(
 		const QString &filter,
 		Type type,
 		QString startFile) {
+	if (parent) {
+		parent = parent->window();
+	}
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
 	if (NativeSupported()) {
 		return GetNative(
--- a/Telegram/ThirdParty/SPMediaKeyTap/SPMediaKeyTap.m
+++ b/Telegram/ThirdParty/SPMediaKeyTap/SPMediaKeyTap.m
@@ -77,7 +77,10 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv
 								  CGEventMaskBit(NX_SYSDEFINED),
 								  tapEventCallback,
 								  self);
-	assert(_eventPort != NULL);
+	if (!_eventPort) {
+		[self stopWatchingMediaKeys];
+		return;
+	}
 	
    _eventPortSource = CFMachPortCreateRunLoopSource(kCFAllocatorSystemDefault, _eventPort, 0);
 	assert(_eventPortSource != NULL);
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,6 +1,6 @@
-AppVersion         1003006
+AppVersion         1003007
 AppVersionStrMajor 1.3
-AppVersionStrSmall 1.3.6
-AppVersionStr      1.3.6
-AlphaChannel       1
+AppVersionStrSmall 1.3.7
+AppVersionStr      1.3.7
+AlphaChannel       0
 BetaVersion        0
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,8 @@
-1.3.6 (11.06.18)
+1.3.7 (11.06.18)
+
+- Push fixes to stable version.
+
+1.3.6 alpha (11.06.18)

 - Bug fixes and other minor improvements.
Author	SHA1	Message	Date
John Preston	b0077d98f0	Version 1.3.7: Fix file dialog parent widget. Regression was introduced in `67ea175fc6`. Fixes #4817.	2018-06-11 23:40:30 +03:00
John Preston	b5bc7a22af	Version 1.3.7: Possible bug fix. Attempt to fix strange crash in SPMediaKeyTap.	2018-06-11 22:31:44 +03:00
John Preston	e60311811b	Version 1.3.7. - Push fixes to stable version.	2018-06-11 22:28:34 +03:00