From dab3bce8baff7a4b4104b08760e4bcecacce5603 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Nov 2021 00:07:22 +0400
Subject: [PATCH] Fix crash on macOS before the app starts.

---
 Telegram/SourceFiles/platform/mac/specific_mac_p.mm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
index 1af409348..cb10872de 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@@ -156,11 +156,15 @@ ApplicationDelegate *_sharedDelegate = nil;
 }
 
 - (BOOL) applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag {
-	if (const auto window = Core::App().activeWindow()) {
-		if (window->widget()->isHidden()) {
-			window->widget()->showFromTray();
+	Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+		if (Core::IsAppLaunched()) {
+			if (const auto window = Core::App().activeWindow()) {
+				if (window->widget()->isHidden()) {
+					window->widget()->showFromTray();
+				}
+			}
 		}
-	}
+	});
 	return YES;
 }