mirror of https://github.com/BOINC/boinc.git
Fix GridRepublic branding bug.
svn path=/trunk/boinc/; revision=13965
This commit is contained in:
parent
89c9b4f112
commit
4394245d16
|
@ -228,18 +228,6 @@ OSStatus CScreensaver::initBOINCApp() {
|
||||||
|
|
||||||
saverState = SaverState_CantLaunchCoreClient;
|
saverState = SaverState_CantLaunchCoreClient;
|
||||||
|
|
||||||
m_CoreClientPID = FindProcessPID("boinc", 0);
|
|
||||||
if (m_CoreClientPID) {
|
|
||||||
m_wasAlreadyRunning = true;
|
|
||||||
saverState = SaverState_LaunchingCoreClient;
|
|
||||||
return noErr;
|
|
||||||
}
|
|
||||||
|
|
||||||
m_wasAlreadyRunning = false;
|
|
||||||
|
|
||||||
if (++retryCount > 3) // Limit to 3 relaunches to prevent thrashing
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
brandId = GetBrandID();
|
brandId = GetBrandID();
|
||||||
switch(brandId) {
|
switch(brandId) {
|
||||||
case 1:
|
case 1:
|
||||||
|
@ -254,6 +242,18 @@ OSStatus CScreensaver::initBOINCApp() {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_CoreClientPID = FindProcessPID("boinc", 0);
|
||||||
|
if (m_CoreClientPID) {
|
||||||
|
m_wasAlreadyRunning = true;
|
||||||
|
saverState = SaverState_LaunchingCoreClient;
|
||||||
|
return noErr;
|
||||||
|
}
|
||||||
|
|
||||||
|
m_wasAlreadyRunning = false;
|
||||||
|
|
||||||
|
if (++retryCount > 3) // Limit to 3 relaunches to prevent thrashing
|
||||||
|
return -1;
|
||||||
|
|
||||||
err = GetpathToBOINCManagerApp(boincPath, sizeof(boincPath));
|
err = GetpathToBOINCManagerApp(boincPath, sizeof(boincPath));
|
||||||
if (err) { // If we couldn't find BOINCManager.app, try default path
|
if (err) { // If we couldn't find BOINCManager.app, try default path
|
||||||
strcpy(boincPath, "/Applications/");
|
strcpy(boincPath, "/Applications/");
|
||||||
|
|
Loading…
Reference in New Issue