From d2a41a42e0ac4de1d84af359102f7ea1dca18497 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 29 Sep 2021 08:35:47 +0400 Subject: [PATCH] Move applicationDidFinishLaunching code to init This should make the Qt patch catching the event unneeded --- .../SourceFiles/platform/mac/specific_mac_p.mm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm index e6a3b00587..ef95bfdccf 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm @@ -147,6 +147,14 @@ ApplicationDelegate *_sharedDelegate = nil; base::Timer _ignoreActivationStop; } +- (instancetype) init: { + _ignoreActivation = false; + _ignoreActivationStop.setCallback([self] { + _ignoreActivation = false; + }); + return [super init]; +} + - (BOOL) applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag { if (const auto window = Core::App().activeWindow()) { if (window->widget()->isHidden()) { @@ -156,13 +164,6 @@ ApplicationDelegate *_sharedDelegate = nil; return YES; } -- (void) applicationDidFinishLaunching:(NSNotification *)aNotification { - _ignoreActivation = false; - _ignoreActivationStop.setCallback([self] { - _ignoreActivation = false; - }); -} - - (void) applicationDidBecomeActive:(NSNotification *)aNotification { Core::Sandbox::Instance().customEnterFromEventLoop([&] { if (Core::IsAppLaunched() && !_ignoreActivation) {