Nikolay Sivov : shell32: Don't call comctl32 on unload time if it wasn' t used before.

Alexandre Julliard julliard at winehq.org
Wed Dec 11 13:05:46 CST 2013


Module: wine
Branch: master
Commit: b5312b70f5c160b3aa3d374256f71ad4aa1f98e6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b5312b70f5c160b3aa3d374256f71ad4aa1f98e6

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Dec 11 08:36:59 2013 +0400

shell32: Don't call comctl32 on unload time if it wasn't used before.

---

 dlls/shell32/iconcache.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index a2373fa..3d54508 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -405,8 +405,10 @@ void SIC_Destroy(void)
 
 	if (sic_hdpa) DPA_DestroyCallback(sic_hdpa, sic_free, NULL );
 
-	ImageList_Destroy(ShellSmallIconList);
-	ImageList_Destroy(ShellBigIconList);
+	if (ShellSmallIconList)
+	    ImageList_Destroy(ShellSmallIconList);
+	if (ShellBigIconList)
+	    ImageList_Destroy(ShellBigIconList);
 
 	LeaveCriticalSection(&SHELL32_SicCS);
 	DeleteCriticalSection(&SHELL32_SicCS);




More information about the wine-cvs mailing list