From f8cfe24d1b96765f628e086da2023755b2577675 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 11 Jan 2022 19:38:36 +0300
Subject: redundant check removed

---
 src/mir_app/src/ei_services.cpp |  6 +-----
 src/mir_app/src/usedIcons.cpp   | 17 ++++++-----------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/mir_app/src/ei_services.cpp b/src/mir_app/src/ei_services.cpp
index e781c06a22..56e3d22b15 100644
--- a/src/mir_app/src/ei_services.cpp
+++ b/src/mir_app/src/ei_services.cpp
@@ -69,11 +69,7 @@ int Clist_SetExtraIcon(MCONTACT hContact, int slot, HANDLE hImage)
 	if (icol == -1)
 		return -1;
 
-	HANDLE hItem = (HANDLE)SendMessage(g_clistApi.hwndContactTree, CLM_FINDCONTACT, hContact, 0);
-	if (hItem == nullptr)
-		return -1;
-
-	SendMessage(g_clistApi.hwndContactTree, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(icol, hImage));
+	SendMessage(g_clistApi.hwndContactTree, CLM_SETEXTRAIMAGE, hContact, MAKELPARAM(icol, hImage));
 	return 0;
 }
 
diff --git a/src/mir_app/src/usedIcons.cpp b/src/mir_app/src/usedIcons.cpp
index 2e12d1bc08..dec0672025 100644
--- a/src/mir_app/src/usedIcons.cpp
+++ b/src/mir_app/src/usedIcons.cpp
@@ -25,18 +25,13 @@ Boston, MA 02111-1307, USA.
 
 struct Icon
 {
-	char *name;
-	int refCount;
-	HANDLE hImage;
+	ptrA name;
+	int refCount = 0;
+	HANDLE hImage = INVALID_HANDLE_VALUE;
 
 	Icon(const char *icolibName) :
-		name( mir_strdup(icolibName)), refCount(0), hImage(INVALID_HANDLE_VALUE)
-	{
-	}
-
-	~Icon()
-	{	mir_free(name);
-	}
+		name(mir_strdup(icolibName))
+	{}
 };
 
 static int SortFunc(const Icon *p1, const Icon *p2)
@@ -77,7 +72,7 @@ HANDLE AddIcon(const char *icolibName)
 
 void RemoveIcon(const char *icolibName)
 {
-	Icon *icon = usedIcons.find((Icon*)&icolibName);
+	Icon *icon = usedIcons.find((Icon *)&icolibName);
 	if (icon != nullptr)
 		icon->refCount--;
 }
-- 
cgit v1.2.3