From c347df8021a398bce60a6f4f69479bc381763e39 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Tue, 19 Feb 2008 13:27:11 +0000
Subject: [PATCH] SCR: Further changes and cleanup of new Mac screensaver; Fix
 bug in Windows screensaver

svn path=/trunk/boinc/; revision=14760
---
 checkin_notes                 | 24 +++++++++++++++++++++---
 clientscr/screensaver_win.cpp |  2 +-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 7bf718fe9b..5603b2e0b5 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -912,7 +912,7 @@ Charlie Jan 29 2008
     - SCR: When running V5 GFX applications as a service / daemon, display 
         appropriate error message instead of trying to display graphics.
     - API: Add executing_as_daemon bool to get_state rpc.
-    - MGR: Disable Show Grapics button for V5 GFX applications when BOINC 
+    - MGR: Disable Show Graphics button for V5 GFX applications when BOINC 
         is running as a service / daemon.
 
     client/
@@ -923,7 +923,7 @@ Charlie Jan 29 2008
         ViewWorkGrid.cpp
     clientscr/
         boinc_ss.rc
-        mac_saver_module.cpp,h
+        mac_saver_module.cpp
         Mac_Saver_Module.h
         screensaver.cpp
         screensaver_win.h
@@ -1387,8 +1387,10 @@ Charlie Feb 14 2008
         instead of horizontally scrolling banner text.
         
     clientscr/
-        mac_saver_module.cpp,h
+        mac_saver_module.cpp
         Mac_Saver_Module.h
+        Mac_Saver_ModuleView.m
+        Mac_Saver_ModuleView.h
         screensaver.cpp
         res/
             boinc_ss_logo.png (new)
@@ -1452,3 +1454,19 @@ David  Feb 18 2008
 
     html/user/
         pending.php
+
+Charlie Feb 19 2008
+    - MAC SCR: Further changes and cleanup of new Mac screensaver; when 
+        applications don't support graphics, cycle progress text through 
+        tasks like Windows screensaver. Fix crash bug when activity is 
+        suspended from a remote host.
+    - WIN SCR: Fix bug in Windows code which cycles progress text.
+        
+    clientscr/
+    clientscr/
+        mac_saver_module.cpp
+        Mac_Saver_Module.h
+        Mac_Saver_ModuleView.m
+        Mac_Saver_ModuleView.h
+        screensaver.cpp
+        screensaver_win.cpp
diff --git a/clientscr/screensaver_win.cpp b/clientscr/screensaver_win.cpp
index 4af2b2b2ad..469fb40dba 100644
--- a/clientscr/screensaver_win.cpp
+++ b/clientscr/screensaver_win.cpp
@@ -899,7 +899,7 @@ VOID CScreensaver::UpdateErrorBoxText() {
             bIsActive     = (results.results.at(iModIndex)->active_task);
             bIsExecuting  = (CPU_SCHED_SCHEDULED == results.results.at(iModIndex)->scheduler_state);
             if (!(bIsActive) || !(bIsDownloaded) || !(bIsExecuting)) continue;
-            pProject = state.lookup_project(results.results.at(iIndex)->project_url);
+            pProject = state.lookup_project(results.results.at(iModIndex)->project_url);
             if (NULL != pProject) {
 				RESULT* pResult = state.lookup_result(pProject, results.results.at(iModIndex)->name);
 				if ( pResult != NULL ) {