From c27009e52c9a736a73be63a827a45a5c5c0b8bbf Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Wed, 18 Oct 2023 07:21:20 +0200
Subject:  launching a binary from the command line hangs on macOS Sonoma
 (#799)

---
 src/Fl_cocoa.mm | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index ea5deb3ea..76753d4f9 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1799,12 +1799,7 @@ void Fl_Cocoa_Screen_Driver::open_display_platform() {
     FLAppDelegate *delegate = (Fl_Darwin_System_Driver::calc_mac_os_version() < 100500 ? [FLAppDelegateBefore10_5 alloc] : [FLAppDelegate alloc]);
     [(NSApplication*)NSApp setDelegate:[delegate init]];
     if (need_new_nsapp) {
-      BOOL condition = (fl_mac_os_version >= 101300);
-      if (fl_mac_os_version >= 140000) { // hack to detect if app is started by Xcode
-        NSDictionary *environment = [[NSProcessInfo processInfo] environment];
-        condition = (environment[@"__XCODE_BUILT_PRODUCTS_DIR_PATHS"] != nil);
-      }
-      if (condition && is_bundled() ) {
+      if (fl_mac_os_version >= 101300 && fl_mac_os_version < 140000 && is_bundled()) {
         [NSApp activateIgnoringOtherApps:YES];
         in_nsapp_run = true;
         [NSApp run];
@@ -1820,15 +1815,15 @@ void Fl_Cocoa_Screen_Driver::open_display_platform() {
                                                 dequeue:NO];
       }
     }
-
-    // empty the event queue but keep system events for drag&drop of files at launch
-    NSEvent *ign_event;
-    do ign_event = [NSApp nextEventMatchingMask:(NSEventMaskAny & ~NSEventMaskSystemDefined)
-                                        untilDate:[NSDate dateWithTimeIntervalSinceNow:0]
-                                           inMode:NSDefaultRunLoopMode
-                                          dequeue:YES];
-    while (ign_event);
-
+    if (fl_mac_os_version < 140000) {
+      // empty the event queue but keep system events for drag&drop of files at launch
+      NSEvent *ign_event;
+       do ign_event = [NSApp nextEventMatchingMask:(NSEventMaskAny & ~NSEventMaskSystemDefined)
+       untilDate:[NSDate dateWithTimeIntervalSinceNow:0]
+       inMode:NSDefaultRunLoopMode
+       dequeue:YES];
+       while (ign_event);
+    }
     if (![NSApp isActive]) foreground_and_activate();
     if (![NSApp servicesMenu]) createAppleMenu();
     else Fl_Sys_Menu_Bar::window_menu_style(Fl_Sys_Menu_Bar::no_window_menu);
-- 
cgit v1.2.3