From: Robert Naumann <gonzomdx@gmail.com>
Date: Wed, 18 May 2016 10:12:13 +0000 (+0000)
Subject: [SHELL32] Addendum to r71343: Remove some unneeded checks. The handles are initialize... 
X-Git-Tag: ReactOS-0.4.2~598
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=59c83ddfe9a0253e2417ebf46bb825085e56a01d

[SHELL32] Addendum to r71343: Remove some unneeded checks. The handles are initialized as NULL so they will never be true

svn path=/trunk/; revision=71351
---

diff --git a/reactos/dll/win32/shell32/dialogs/folder_options.cpp b/reactos/dll/win32/shell32/dialogs/folder_options.cpp
index 7aed1efde2e..3da1c69ba0c 100644
--- a/reactos/dll/win32/shell32/dialogs/folder_options.cpp
+++ b/reactos/dll/win32/shell32/dialogs/folder_options.cpp
@@ -99,11 +99,6 @@ UpdateGeneralIcons(HWND hDlg)
 
     if (lpTaskIconName)
     {
-        if (hTaskIcon)
-        {
-            DeleteObject(hTaskIcon);
-        }
-
         hTaskIcon = (HICON)LoadImage(shell32_hInstance,
                                               lpTaskIconName,
                                               IMAGE_ICON,
@@ -132,11 +127,6 @@ UpdateGeneralIcons(HWND hDlg)
     
     if (lpFolderIconName)
     {
-        if (hFolderIcon)
-        {
-            DeleteObject(hFolderIcon);
-        }
-        
         hFolderIcon = (HICON)LoadImage(shell32_hInstance,
                                               lpFolderIconName,
                                               IMAGE_ICON,
@@ -165,11 +155,6 @@ UpdateGeneralIcons(HWND hDlg)
 
     if (lpClickIconName)
     {
-        if (hClickIcon)
-        {
-            DeleteObject(hClickIcon);
-        }
-        
         hClickIcon = (HICON)LoadImage(shell32_hInstance,
                                               lpClickIconName,
                                               IMAGE_ICON,