diff --git a/checkin_notes b/checkin_notes index 05f748a6dd..e775acf2f8 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2826,3 +2826,11 @@ David 15 Apr 2010 gui_rpc_server_ops.cpp lib/ proxy_info.cpp + +Charlie 13 Apr 2010 + - client: Improve code for determining non-BOINC CPU time for branded + clients (Mac & Windows). + + lib/ + procinfo_mac.cpp + procinfo_win.cpp diff --git a/lib/procinfo_mac.cpp b/lib/procinfo_mac.cpp index 11221bcb5f..d94a2f0400 100644 --- a/lib/procinfo_mac.cpp +++ b/lib/procinfo_mac.cpp @@ -128,12 +128,12 @@ int procinfo_setup(vector& pi) { switch (iBrandID) { case GRIDREPUBLIC_BRAND_ID: - if (strcasestr(p.command, "GridRepublic")) { + if (!strcmp(p.command, "GridRepublic Desktop")) { p.is_boinc_app = true; } break; case PROGRESSTHRUPROCESSORS_BRAND_ID: - if (strcasestr(p.command, "Progress Thru Processors")) { + if (!strcmp(p.command, "Progress Thru Processors Desktop")) { p.is_boinc_app = true; } break; diff --git a/lib/procinfo_win.cpp b/lib/procinfo_win.cpp index 5cdd3e3386..fbea7e633f 100644 --- a/lib/procinfo_win.cpp +++ b/lib/procinfo_win.cpp @@ -106,12 +106,12 @@ int get_procinfo_XP(vector& pi) { p.is_boinc_app = (p.id == pid) || (strcasestr(p.command, "boinc") != NULL); #ifdef _GRIDREPUBLIC - if (strcasestr(p.command, "gridrepublic") != NULL) { + if (!strcmp(p.command, "gridrepublic.exe") { p.is_boinc_app = true; } #endif #ifdef _PROGRESSTHRUPROCESSORS - if (strcasestr(p.command, "progressthruprocessors") != NULL) { + if (!strcmp(p.command, "progressthruprocessors.exe") { p.is_boinc_app = true; } #endif