https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24517d525812e955167ed3e05156633a381ca6fd
commit 24517d525812e955167ed3e05156633a381ca6fd Author: Doug Lyons <dougly...@douglyons.com> AuthorDate: Sun Aug 18 20:09:47 2024 -0500 Commit: GitHub <nore...@github.com> CommitDate: Sun Aug 18 20:09:47 2024 -0500 [DESK] Fix 3dtext screensaver restart after opening settings (#7213) --- dll/cpl/desk/screensaver.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dll/cpl/desk/screensaver.c b/dll/cpl/desk/screensaver.c index a0515eab698..56da1e87fb4 100644 --- a/dll/cpl/desk/screensaver.c +++ b/dll/cpl/desk/screensaver.c @@ -223,7 +223,7 @@ SetScreenSaverPreviewBox(HWND hwndDlg, PDATA pData) } } -static BOOL +static VOID WaitForSettingsDialog(HWND hwndDlg, HANDLE hProcess) { @@ -243,22 +243,18 @@ WaitForSettingsDialog(HWND hwndDlg, { if (msg.message == WM_QUIT) { - return FALSE; + return; } - if (IsDialogMessage(hwndDlg, &msg)) + if (!IsDialogMessage(hwndDlg, &msg)) { TranslateMessage(&msg); DispatchMessage(&msg); } } } - else if (dwResult == WAIT_OBJECT_0) - { - return TRUE; - } else { - return FALSE; + return; } } } @@ -308,8 +304,8 @@ ScreenSaverConfig(HWND hwndDlg, PDATA pData) pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; } - if (WaitForSettingsDialog(hwndDlg, pi.hProcess)) - SetScreenSaverPreviewBox(hwndDlg, pData); + WaitForSettingsDialog(hwndDlg, pi.hProcess); + SetScreenSaverPreviewBox(hwndDlg, pData); CloseHandle(pi.hProcess); CloseHandle(pi.hThread);