Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- WINSCR: Fix problem with the screensaver needlessly cycling in 

preview mode.  Ugh.

svn path=/trunk/boinc/; revision=25990
This commit is contained in:
Rom Walton 2012-08-07 21:43:30 +00:00
parent fd631016cb
commit 813409168b
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -5323,3 +5323,10 @@ Rom 7 Aug 2012
api/ api/
Makefile.am Makefile.am
Rom 7 Aug 2012
- WINSCR: Fix problem with the screensaver needlessly cycling in
preview mode. Ugh.
clientscr/
screensaver_win.cpp

23
clientscr/screensaver_win.cpp
View File

@ -1359,6 +1359,21 @@ LRESULT CScreensaver::SaverProc(
return 0; return 0;
break; break;
case WM_CLOSE:
BOINCTRACE(_T("CScreensaver::SaverProc Received WM_CLOSE\n"));
DestroyWindow(hWnd);
return 0;
break;
case WM_DESTROY:
BOINCTRACE(_T("CScreensaver::SaverProc Received WM_DESTROY\n"));
if (m_SaverMode == sm_preview || m_SaverMode == sm_test) {
ShutdownSaver();
}
PostQuitMessage(0);
return 0;
break;
case WM_SYSCOMMAND: case WM_SYSCOMMAND:
BOINCTRACE(_T("CScreensaver::SaverProc Received WM_SYSCOMMAND\n")); BOINCTRACE(_T("CScreensaver::SaverProc Received WM_SYSCOMMAND\n"));
if (m_SaverMode == sm_full) { if (m_SaverMode == sm_full) {
@ -1394,14 +1409,15 @@ LRESULT CScreensaver::SaverProc(
// All initialization messages have gone through. Allow // All initialization messages have gone through. Allow
// 500ms of idle time, then proceed with initialization. // 500ms of idle time, then proceed with initialization.
SetTimer(hWnd, 1, 500, NULL); SetTimer(hWnd, 1, 500, NULL);
return 0;
} else if (WM_INTERRUPTSAVER == uMsg) { } else if (WM_INTERRUPTSAVER == uMsg) {
BOINCTRACE(_T("CScreensaver::SaverProc Received WM_INTERRUPTSAVER\n")); BOINCTRACE(_T("CScreensaver::SaverProc Received WM_INTERRUPTSAVER\n"));
ShutdownSaver();
CloseWindow(hWnd); CloseWindow(hWnd);
DestroyWindow(hWnd); ShutdownSaver();
PostQuitMessage(0); PostQuitMessage(0);
return 0;
} }
@ -1538,12 +1554,13 @@ LRESULT CScreensaver::GenericSaverProc(
// All initialization messages have gone through. Allow // All initialization messages have gone through. Allow
// 500ms of idle time, then proceed with initialization. // 500ms of idle time, then proceed with initialization.
SetTimer(hWnd, 1, 500, NULL); SetTimer(hWnd, 1, 500, NULL);
return 0;
} else if (WM_INTERRUPTSAVER == uMsg) { } else if (WM_INTERRUPTSAVER == uMsg) {
BOINCTRACE(_T("CScreensaver::GenericSaverProc Received WM_INTERRUPTSAVER\n")); BOINCTRACE(_T("CScreensaver::GenericSaverProc Received WM_INTERRUPTSAVER\n"));
CloseWindow(hWnd); CloseWindow(hWnd);
DestroyWindow(hWnd); return 0;
} }