From 3dc0d9b0b7c30ea2f77d74c4ce5b6ccd67bd525c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 9 Apr 2013 21:40:22 +0000
Subject: - the kernel filters out contacts by proto names much faster than a
 plugin; - database cycles simplified

git-svn-id: http://svn.miranda-ng.org/main/trunk@4404 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/chat/clist.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'plugins/TabSRMM/src/chat')

diff --git a/plugins/TabSRMM/src/chat/clist.cpp b/plugins/TabSRMM/src/chat/clist.cpp
index 483603b24d..cab020142b 100644
--- a/plugins/TabSRMM/src/chat/clist.cpp
+++ b/plugins/TabSRMM/src/chat/clist.cpp
@@ -291,19 +291,17 @@ BOOL CList_AddEvent(HANDLE hContact, HICON Icon, HANDLE event, int type, const T
 
 HANDLE CList_FindRoom(const char* pszModule, const TCHAR* pszRoom)
 {
-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
-		char *szProto = GetContactProto(hContact);
-		if (szProto && !lstrcmpiA(szProto, pszModule)) {
-			if (M->GetByte(hContact, szProto, "ChatRoom", 0) != 0) {
-				DBVARIANT dbv;
-				if (!M->GetTString(hContact, szProto, "ChatRoomID", &dbv)) {
-					if (!lstrcmpi(dbv.ptszVal, pszRoom)) {
-						db_free(&dbv);
-						return hContact;
-					}
-					db_free(&dbv);
-				}
+	for (HANDLE hContact = db_find_first(pszModule); hContact; hContact = db_find_next(hContact, pszModule)) {
+		if ( !M->GetByte(hContact, pszModule, "ChatRoom", 0))
+			continue;
+
+		DBVARIANT dbv;
+		if (!M->GetTString(hContact, pszModule, "ChatRoomID", &dbv)) {
+			if (!lstrcmpi(dbv.ptszVal, pszRoom)) {
+				db_free(&dbv);
+				return hContact;
 			}
+			db_free(&dbv);
 		}
 	}
 	return 0;
-- 
cgit v1.2.3