summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2019-04-02 19:17:32 +0300
committerGeorge Hazan <ghazan@miranda.im>2019-04-02 19:17:32 +0300
commitc78da653c2806e0ac72e0c7baa499342a4c637e5 (patch)
tree698ad0ca1188ed901aa13219885aa24a61b47cf8 /src
parentd788b07db648f5b435e552943cdd5a7b20a4ea3c (diff)
merge with trunk
Diffstat (limited to 'src')
-rw-r--r--src/mir_app/src/ei_services.cpp7
1 files changed, 6 insertions, 1 deletions
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;
+ }
}