From fee3a74e7429552ebbfe7ae9c14a4f6c25156fb6 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 13 Apr 2019 00:11:59 +0300
Subject: CMPluginBase::addImgListIcon: new helper to safely add an icolib icon
 to HIMAGELIST

---
 plugins/Scriver/src/chat_main.cpp |  3 +--
 plugins/Scriver/src/globals.cpp   | 10 ++++++----
 plugins/Scriver/src/msglog.cpp    |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'plugins/Scriver/src')

diff --git a/plugins/Scriver/src/chat_main.cpp b/plugins/Scriver/src/chat_main.cpp
index 397ac4ae75..6fdf6ac8bc 100644
--- a/plugins/Scriver/src/chat_main.cpp
+++ b/plugins/Scriver/src/chat_main.cpp
@@ -88,8 +88,7 @@ static MODULEINFO* MM_CreateModule()
 static void OnCreateModule(MODULEINFO *mi)
 {
 	HIMAGELIST hList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 0);
-
-	int overlayIcon = ImageList_AddIcon(hList, g_plugin.getIcon(IDI_OVERLAY));
+	int overlayIcon = g_plugin.addImgListIcon(hList, IDI_OVERLAY);
 	ImageList_SetOverlayImage(hList, overlayIcon, 1);
 
 	int index = ImageList_AddIcon(hList, Skin_LoadProtoIcon(mi->pszModule, ID_STATUS_ONLINE));
diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp
index bed9a909e6..0e4ba89823 100644
--- a/plugins/Scriver/src/globals.cpp
+++ b/plugins/Scriver/src/globals.cpp
@@ -230,15 +230,17 @@ void LoadGlobalIcons()
 		if (it == 0)
 			ImageList_AddIcon_ProtoEx(g_dat.hButtonIconList, nullptr, ID_STATUS_OFFLINE);
 		else
-			ImageList_AddIcon(g_dat.hButtonIconList, g_plugin.getIcon(it));
+			g_plugin.addImgListIcon(g_dat.hButtonIconList, it);
 	}
 	
 	for (auto &it : chatButtonIcons)
-		ImageList_AddIcon(g_dat.hChatButtonIconList, g_plugin.getIcon(it));
+		g_plugin.addImgListIcon(g_dat.hChatButtonIconList, it);
 
-	ImageList_AddIcon(g_dat.hHelperIconList, g_plugin.getIcon(IDI_OVERLAY));
-	int overlayIcon = ImageList_AddIcon(g_dat.hHelperIconList, g_plugin.getIcon(IDI_OVERLAY));
+	g_plugin.addImgListIcon(g_dat.hHelperIconList, IDI_OVERLAY);
+
+	int overlayIcon = g_plugin.addImgListIcon(g_dat.hHelperIconList, IDI_OVERLAY);
 	ImageList_SetOverlayImage(g_dat.hHelperIconList, overlayIcon, 1);
+
 	for (int i = IDI_GOOGLE; i < IDI_LASTICON; i++) {
 		HICON hIcon = (HICON)LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(i), IMAGE_ICON, 0, 0, 0);
 		ImageList_AddIcon(g_dat.hSearchEngineIconList, hIcon);
diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp
index 2d1e397d61..67de067e91 100644
--- a/plugins/Scriver/src/msglog.cpp
+++ b/plugins/Scriver/src/msglog.cpp
@@ -793,17 +793,17 @@ void LoadMsgLogIcons(void)
 	for (int i = 0; i < _countof(pLogIconBmpBits); i++) {
 		switch (i) {
 		case LOGICON_MSG_IN:
-			ImageList_AddIcon(g_hImageList, g_plugin.getIcon(IDI_INCOMING));
+			g_plugin.addImgListIcon(g_hImageList, IDI_INCOMING);
 			hIcon = ImageList_GetIcon(g_hImageList, LOGICON_MSG_IN, ILD_NORMAL);
 			hBrush = hInBkgBrush;
 			break;
 		case LOGICON_MSG_OUT:
-			ImageList_AddIcon(g_hImageList, g_plugin.getIcon(IDI_OUTGOING));
+			g_plugin.addImgListIcon(g_hImageList, IDI_OUTGOING);
 			hIcon = ImageList_GetIcon(g_hImageList, LOGICON_MSG_OUT, ILD_NORMAL);
 			hBrush = hOutBkgBrush;
 			break;
 		case LOGICON_MSG_NOTICE:
-			ImageList_AddIcon(g_hImageList, g_plugin.getIcon(IDI_NOTICE));
+			g_plugin.addImgListIcon(g_hImageList, IDI_NOTICE);
 			hIcon = ImageList_GetIcon(g_hImageList, LOGICON_MSG_NOTICE, ILD_NORMAL);
 			hBrush = hBkgBrush;
 			break;
-- 
cgit v1.2.3