diff --git a/checkin_notes b/checkin_notes index 4761b27979..52c140f145 100755 --- a/checkin_notes +++ b/checkin_notes @@ -14255,3 +14255,10 @@ David 5 Dec 2005 gui_rpc_server.C net_xfer_curl.C scheduler_op.C,h + +Charlie 6 Dec 2005 + - Mac: Fix crash bug launching core client when there is a space + character in the path to the BOINC Manager. + + clientgui/ + BOINCGUIApp.cpp diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp index 5a5e4e9c1a..e971ff4895 100644 --- a/clientgui/BOINCGUIApp.cpp +++ b/clientgui/BOINCGUIApp.cpp @@ -386,6 +386,7 @@ void CBOINCGUIApp::StartupBOINCCore() { { wxChar buf[1024]; + wxChar *argv[3]; ProcessSerialNumber ourPSN; FSRef ourFSRef; OSErr err; @@ -399,9 +400,18 @@ void CBOINCGUIApp::StartupBOINCCore() { err = FSRefMakePath (&ourFSRef, (UInt8*)buf, sizeof(buf)); } if (err == noErr) { +#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"); + 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; + m_lBOINCCoreProcessId = ::wxExecute(argv); +#endif } else { buf[0] = '\0'; } @@ -462,11 +472,10 @@ void CBOINCGUIApp::StartupBOINCCore() { // Append boinc.exe to the end of the strExecute string and get ready to rock strExecute = wxT("./boinc -redirectio"); + m_lBOINCCoreProcessId = ::wxExecute(strExecute); #endif // ! __WXMAC__ - m_lBOINCCoreProcessId = ::wxExecute(strExecute); - #endif // ! __WXMSW__ if (0 != m_lBOINCCoreProcessId) { diff --git a/mac_build/English.lproj/InfoPlist.strings b/mac_build/English.lproj/InfoPlist.strings index d6e7f8148a..943156c61d 100755 --- a/mac_build/English.lproj/InfoPlist.strings +++ b/mac_build/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "BOINC"; -CFBundleShortVersionString = "BOINC version 5.3.1"; -CFBundleGetInfoString = "BOINC version 5.3.1, Copyright 2005 University of California."; +CFBundleShortVersionString = "BOINC version 5.3.2"; +CFBundleGetInfoString = "BOINC version 5.3.2, Copyright 2005 University of California."; diff --git a/mac_build/Info.plist b/mac_build/Info.plist index e7aeeb9645..b37433118e 100644 --- a/mac_build/Info.plist +++ b/mac_build/Info.plist @@ -17,6 +17,6 @@ CFBundleSignature BNC! CFBundleVersion - 5.3.1 + 5.3.2 diff --git a/mac_build/Installer-info.plist b/mac_build/Installer-info.plist index 8b8e9c2d97..b41c224037 100644 --- a/mac_build/Installer-info.plist +++ b/mac_build/Installer-info.plist @@ -15,6 +15,6 @@ CFBundleSignature ???? CFBundleVersion - 5.3.1 + 5.3.2 diff --git a/mac_build/ScreenSaver-Info.plist b/mac_build/ScreenSaver-Info.plist index 72e35b2d80..f72dff4a90 100644 --- a/mac_build/ScreenSaver-Info.plist +++ b/mac_build/ScreenSaver-Info.plist @@ -17,7 +17,7 @@ CFBundleSignature ???? CFBundleVersion - 5.3.1 + 5.3.2 NSPrincipalClass BOINC_Saver_ModuleView diff --git a/mac_build/SystemMenu-Info.plist b/mac_build/SystemMenu-Info.plist index daae90d914..389520e9cd 100644 --- a/mac_build/SystemMenu-Info.plist +++ b/mac_build/SystemMenu-Info.plist @@ -15,6 +15,6 @@ CFBundleSignature ???? CFBundleVersion - 5.3.1 + 5.3.2