From f98e2216f98a31dbb0f77b97249aaaee75b345ed Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 22 Dec 2013 16:20:05 +0000
Subject: massive garbage removal from extra icons module

git-svn-id: http://svn.miranda-ng.org/main/trunk@7340 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/extraicons/extraicons.cpp | 4 ++--
 src/modules/extraicons/extraicons.h   | 2 +-
 src/modules/extraicons/options_ei.cpp | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/modules/extraicons')

diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp
index 745083590b..4b7876b79c 100644
--- a/src/modules/extraicons/extraicons.cpp
+++ b/src/modules/extraicons/extraicons.cpp
@@ -320,7 +320,7 @@ void fnReloadExtraIcons()
 	bImageCreated = true;
 }
 
-void fnSetAllExtraIcons(HWND hwndList, HANDLE hContact)
+void fnSetAllExtraIcons(HANDLE hContact)
 {
 	if (cli.hwndContactTree == 0)
 		return;
@@ -347,7 +347,7 @@ void fnSetAllExtraIcons(HWND hwndList, HANDLE hContact)
 	}
 
 	g_mutex_bSetAllExtraIconsCycle = 0;
-	cli.pfnInvalidateRect(hwndList, NULL, FALSE);
+	cli.pfnInvalidateRect(cli.hwndContactTree, NULL, FALSE);
 	Sleep(0);
 }
 
diff --git a/src/modules/extraicons/extraicons.h b/src/modules/extraicons/extraicons.h
index b8c346b9f2..c24483def5 100644
--- a/src/modules/extraicons/extraicons.h
+++ b/src/modules/extraicons/extraicons.h
@@ -48,7 +48,7 @@ void DefaultExtraIcons_Load();
 HANDLE ExtraIcon_Add(HICON hIcon);
 
 void fnReloadExtraIcons();
-void fnSetAllExtraIcons(HWND hwndList,HANDLE hContact);
+void fnSetAllExtraIcons(HANDLE hContact);
 
 static inline BOOL IsEmpty(const char *str)
 {
diff --git a/src/modules/extraicons/options_ei.cpp b/src/modules/extraicons/options_ei.cpp
index e5893ecc9c..a7ce5cb64e 100644
--- a/src/modules/extraicons/options_ei.cpp
+++ b/src/modules/extraicons/options_ei.cpp
@@ -571,7 +571,8 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					if (oldSlots[((BaseExtraIcon *) extra)->getID() - 1] == extra->getSlot())
 						continue;
 
-				extra->applyIcons();
+				if (extra->isEnabled())
+					extra->applyIcons();
 			}
 
 			delete[] oldSlots;
-- 
cgit v1.2.3