From fecd7251a72168ed35bdc8ca4aec48342c0ff8b6 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Wed, 28 Feb 2007 11:28:45 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=12169
---
 checkin_notes             |  2 ++
 clientgui/BOINCGUIApp.cpp | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 49b0e1a0f3..5469430636 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -2099,9 +2099,11 @@ Charlie 28 Feb 2007
         be recent user activity.  Added logic to screensaver to relaunch cc in 
         case of certain race conditions (e.g., screensaver started, dismissed, 
         restarted in rapid succession.)
+    - Mac Manager: add -launched_by_manager arg when launching core client.
         
     client/
         cs_prefs.C
     clientgui/
+        BOINCGUIApp.cpp
         mac/
             mac_saver_module.cpp
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index ad1f336e07..a0b3697274 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -530,7 +530,7 @@ void CBOINCGUIApp::StartupBOINCCore() {
 
         {
             wxChar buf[1024];
-            wxChar *argv[4];
+            wxChar *argv[5];
             ProcessSerialNumber ourPSN;
             FSRef ourFSRef;
             OSErr err;
@@ -547,17 +547,18 @@ void CBOINCGUIApp::StartupBOINCCore() {
 #if 0   // The Mac version of wxExecute(wxString& ...) crashes if there is a space in the path
                 strExecute = wxT("\"");            
                 strExecute += wxT(buf);
-                strExecute += wxT("/Contents/Resources/boinc\" -redirectio");
+                strExecute += wxT("/Contents/Resources/boinc\" -redirectio -launched_by_manager");
                 m_lBOINCCoreProcessId = ::wxExecute(strExecute);
 #else   // Use wxExecute(wxChar **argv ...) instead of wxExecute(wxString& ...)
                 strcat(buf, "/Contents/Resources/boinc");
                 argv[0] = buf;
                 argv[1] = "-redirectio";
-                argv[2] = NULL;
+                argv[2] = "-launched_by_manager";
+                argv[3] = NULL;
 #ifdef SANDBOX
                 if (! g_use_sandbox) {
-                    argv[2] = "-insecure";
-                    argv[3] = NULL;
+                    argv[3] = "-insecure";
+                    argv[4] = NULL;
                 }
 #endif  
                 m_lBOINCCoreProcessId = ::wxExecute(argv);