From 4394245d16f40966abbe9385d4e11e7cb4e02e9f Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Fri, 26 Oct 2007 10:00:00 +0000
Subject: [PATCH] Fix GridRepublic branding bug.

svn path=/trunk/boinc/; revision=13965
---
 clientscr/mac_saver_module.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/clientscr/mac_saver_module.cpp b/clientscr/mac_saver_module.cpp
index 763eaa7fd6..66ffd1bed0 100644
--- a/clientscr/mac_saver_module.cpp
+++ b/clientscr/mac_saver_module.cpp
@@ -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:
@@ -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/");