From df6b0c988eb26339d4c7e4a1d0fe3b9717703c28 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 9 Mar 2018 19:32:32 +0300
Subject: more loop-related code cleaning

---
 plugins/YAPP/src/services.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'plugins/YAPP/src/services.cpp')

diff --git a/plugins/YAPP/src/services.cpp b/plugins/YAPP/src/services.cpp
index 87ef273df9..d9143ab624 100644
--- a/plugins/YAPP/src/services.cpp
+++ b/plugins/YAPP/src/services.cpp
@@ -323,7 +323,7 @@ INT_PTR Popup_ShowHistory(WPARAM, LPARAM)
 	return 0;
 }
 
-LIST<POPUPCLASS> arClasses(3);
+LIST<POPUPCLASS> arClasses(3, PtrKeySortT);
 
 static INT_PTR RegisterPopupClass(WPARAM, LPARAM lParam)
 {
@@ -361,15 +361,12 @@ static INT_PTR UnregisterPopupClass(WPARAM, LPARAM lParam)
 	POPUPCLASS *pc = (POPUPCLASS*)lParam;
 	if (pc == nullptr)
 		return 1;
+	if (arClasses.find(pc) == nullptr)
+		return 1;
 
-	for (int i=0; i < arClasses.getCount(); i++)
-		if (arClasses[i] == pc) {
-			arClasses.remove(i);
-			FreePopupClass(pc);
-			return 0;
-		}
-
-	return 1;
+	arClasses.remove(pc);
+	FreePopupClass(pc);
+	return 0;
 }
 
 static INT_PTR CreateClassPopup(WPARAM wParam, LPARAM lParam)
-- 
cgit v1.2.3