1 files changed, 1 insertions, 6 deletions
diff --git a/src/modules/extraicons/ExtraIcon.cpp b/src/modules/extraicons/ExtraIcon.cpp
index f59a7310fa..379265e9ba 100644
--- a/src/modules/extraicons/ExtraIcon.cpp
+++ b/src/modules/extraicons/ExtraIcon.cpp
@@ -67,15 +67,10 @@ void ExtraIcon::applyIcons()
 	if (!isEnabled())
 		return;
 
-	HANDLE hContact = db_find_first();
-	while (hContact != NULL)
-	{
+	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 		// Clear to assert that it will be cleared
 		Clist_SetExtraIcon(hContact, slot, INVALID_HANDLE_VALUE);
-
 		applyIcon(hContact);
-
-		hContact = db_find_next(hContact);
 	}
 }