Skip to content

Commit

Permalink
Fix GridRepublic branding bug.
Browse files Browse the repository at this point in the history
svn path=/trunk/boinc/; revision=13965
  • Loading branch information
Charlie Fenton committed Oct 26, 2007
1 parent 89c9b4f commit 4394245
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions clientscr/mac_saver_module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -228,18 +228,6 @@ OSStatus CScreensaver::initBOINCApp() {

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();
switch(brandId) {
case 1:
Expand All @@ -254,6 +242,18 @@ OSStatus CScreensaver::initBOINCApp() {
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));
if (err) { // If we couldn't find BOINCManager.app, try default path
strcpy(boincPath, "/Applications/");
Expand Down

0 comments on commit 4394245

Please sign in to comment.