https://git.reactos.org/?p=reactos.git;a=commitdiff;h=938df97b54aa0d61d6c213...
commit 938df97b54aa0d61d6c2134b5e50d0a2873c0bd6 Author: Serge Gautherie 32623169+SergeGautherie@users.noreply.github.com AuthorDate: Tue May 26 20:25:39 2020 +0200 Commit: GitHub noreply@github.com CommitDate: Tue May 26 20:25:39 2020 +0200
[WIN32K:NTUSER] NC_IconForWindow(): Remove redundant if() (#2842)
No impact.
Detected by Cppcheck: identicalInnerCondition. Addendum to 98060c28c8b051bc4cfd460bd008a2eff125658e (r60622). --- win32ss/user/ntuser/nonclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index 0c7dac84c48..59bd57e2f3d 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -696,7 +696,7 @@ PCURICON_OBJECT FASTCALL NC_IconForWindow( PWND pWnd ) // it does not use the default icon! And it does not check for DS_MODALFRAME. if (!hIcon && !(pWnd->ExStyle & WS_EX_DLGMODALFRAME)) { - if (!hIcon) hIcon = gpsi->hIconSmWindows; // Both are IDI_WINLOGO Small + hIcon = gpsi->hIconSmWindows; // Both are IDI_WINLOGO Small if (!hIcon) hIcon = gpsi->hIconWindows; // Reg size. } if (hIcon)