Remove calls to SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE,... as it does not make sense to activate and deactivate screen savers when activating or deactivating the screen saver page. The screen saver should be activated when the user chooses a screen saver and it should be deactivated when the user chooses the "None" option.

CORE-6963#resolve

svn path=/trunk/; revision=58358
This commit is contained in:
Eric Kohl 2013-02-23 18:52:13 +00:00
parent df4ce11ad6
commit 9ec74f1b1b

View file

@ -758,16 +758,14 @@ ScreenSaverPageProc(HWND hwndDlg,
case PSN_SETACTIVE: case PSN_SETACTIVE:
{ {
/* Activate screen saver support */ /* Enable screensaver preview support */
SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, 0, SPIF_SENDCHANGE);
SetScreenSaverPreviewBox(hwndDlg, pData); SetScreenSaverPreviewBox(hwndDlg, pData);
break; break;
} }
case PSN_KILLACTIVE: case PSN_KILLACTIVE:
{ {
/* Disable screensaver support */ /* Kill running preview screensaver */
SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, 0, SPIF_SENDCHANGE);
if (pData->PrevWindowPi.hProcess) if (pData->PrevWindowPi.hProcess)
{ {
TerminateProcess(pData->PrevWindowPi.hProcess, 0); TerminateProcess(pData->PrevWindowPi.hProcess, 0);