Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=9044
This commit is contained in:
Charlie Fenton 2005-12-06 11:39:00 +00:00
parent 42dbdc2183
commit ef79f6a234
7 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -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

13
clientgui/BOINCGUIApp.cpp
View File

@ -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) {

4
mac_build/English.lproj/InfoPlist.strings
View File

@ -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.";

2
mac_build/Info.plist
View File

@ -17,6 +17,6 @@
<key>CFBundleSignature</key>
<string>BNC!</string>
<key>CFBundleVersion</key>
<string>5.3.1</string>
<string>5.3.2</string>
</dict>
</plist>

2
mac_build/Installer-info.plist
View File

@ -15,6 +15,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>5.3.1</string>
<string>5.3.2</string>
</dict>
</plist>

2
mac_build/ScreenSaver-Info.plist
View File

@ -17,7 +17,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>5.3.1</string>
<string>5.3.2</string>
<key>NSPrincipalClass</key>
<string>BOINC_Saver_ModuleView</string>
</dict>

2
mac_build/SystemMenu-Info.plist
View File

@ -15,6 +15,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>5.3.1</string>
<string>5.3.2</string>
</dict>
</plist>