From 19a7d971aaca383901babdc0852eadea12c3c0cd Mon Sep 17 00:00:00 2001
From: pescuma <pescuma@c086bb3d-8645-0410-b8da-73a8550f86e7>
Date: Mon, 13 Apr 2009 00:26:46 +0000
Subject: extraicons: merge more than one icon with same name and some fixes

git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@161 c086bb3d-8645-0410-b8da-73a8550f86e7
---
 Plugins/extraicons/options.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Plugins/extraicons/options.cpp')

diff --git a/Plugins/extraicons/options.cpp b/Plugins/extraicons/options.cpp
index 8a0e6ba..c1b4852 100644
--- a/Plugins/extraicons/options.cpp
+++ b/Plugins/extraicons/options.cpp
@@ -210,8 +210,14 @@ static BOOL CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 
 				for (int j = 0; j < numSlots; ++j)
 				{
-					if (SendDlgItemMessage(hwndDlg, IDC_SLOT + j * 2, CB_GETCURSEL, 0, 0) != 0)
+					// Has icon?
+					bool found = false;
+					for (i = 0; !found && i < (int) extraIcons.size(); ++i)
+						found = (slots[i] == j);
+					if (found)
 						continue;
+
+					// Had icon?
 					if (GetExtraIconBySlot(j) == NULL)
 						continue;
 
-- 
cgit v1.2.3