From c78da653c2806e0ac72e0c7baa499342a4c637e5 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 2 Apr 2019 19:17:32 +0300
Subject: merge with trunk

---
 src/mir_app/src/ei_services.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mir_app/src/ei_services.cpp b/src/mir_app/src/ei_services.cpp
index cecff12090..65cab195c6 100644
--- a/src/mir_app/src/ei_services.cpp
+++ b/src/mir_app/src/ei_services.cpp
@@ -259,7 +259,7 @@ int ClistExtraClick(WPARAM hContact, LPARAM lParam)
 HANDLE hEventExtraImageListRebuilding, hEventExtraImageApplying, hEventExtraClick;
 
 static bool bImageCreated = false;
-static HIMAGELIST hExtraImageList;
+static HIMAGELIST hExtraImageList = nullptr;
 
 MIR_APP_DLL(HANDLE) ExtraIcon_AddIcon(HICON hIcon)
 {
@@ -493,4 +493,9 @@ void UnloadExtraIconsModule(void)
 
 	for (auto &it : registeredExtraIcons)
 		delete it;
+
+	if (hExtraImageList) {
+		ImageList_Destroy(hExtraImageList);
+		hExtraImageList = nullptr;
+	}
 }
-- 
cgit v1.2.3