From d4e099a4f3e962760f254210cdc5dd3bbd52811b Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Wed, 22 Jul 2020 12:36:25 +0000
Subject: [PATCH] startlazarus: cocoa: do not use open -a, execute bundle exe,
 else menu is not visible

git-svn-id: branches/fixes_2_0@63621 -
---
 ide/lazarusmanager.pas |   8 ++++++--
 ide/startlazarus.res   | Bin 138428 -> 138476 bytes
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ide/lazarusmanager.pas b/ide/lazarusmanager.pas
index 87b8e1534a..7d735a83ce 100644
--- a/ide/lazarusmanager.pas
+++ b/ide/lazarusmanager.pas
@@ -370,17 +370,21 @@ begin
       {$IFDEF darwin}
       if FileExistsUTF8(FLazarusPath+'.app') then begin
         // start the bundle instead
+        {$IFDEF LCLCocoa}
+        FLazarusPath:= FLazarusPath+'.app/Contents/MacOS/'+ExtractFileName(FLazarusPath);
+        {$ELSE}
         FLazarusPath:= FLazarusPath+'.app';// /Contents/MacOS/'+ExtractFileName(FLazarusPath);
+        {$ENDIF}
       end;
       {$ENDIF}
 
-      DebugLn(['TLazarusManager.Run starting ',FLazarusPath,' ...']);
+      DebugLn(['Info: (startlazarus) [TLazarusManager.Run] starting ',FLazarusPath,' ...']);
       EnvOverrides:=TStringList.Create;
       try
         {$IFDEF Linux}
         EnvOverrides.Values['LIBOVERLAY_SCROLLBAR']:='0';
         {$ENDIF}
-        {$IFDEF darwin}
+        {$IFDEF LCLCarbon}
         FLazarusProcess :=
           TLazarusProcess.Create('open',
                ' -a ' + FLazarusPath + ' --args ' + GetCommandLineParameters(FCmdLineParams, True)+' '+FCmdLineFiles,
diff --git a/ide/startlazarus.res b/ide/startlazarus.res
index 81e18b4a1c8c812ba815afc63e608b6ab7c69226..7ca3bf528e3ef4edc41cd8f5bab29a37719da4a8 100644
GIT binary patch
delta 70
zcmdn9ljF@!jtL5k4>u}KV^dME$;r=44@fM@a4b(OO0`Q%%qdQ_(MJ)Syq3+Kk)ioB
QTl;4=#_gZkm`;iU0L^?F)Bpeg

delta 31
ncmaE}lVi_LjtL5kn>Q*>W1IYx&9+&Ey<LT!ak~mT(+N=k%TWs2