From 340562e4bd9236fadf2e37ae6f7737f1ea340a90 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 25 Oct 2013 21:15:00 +0000
Subject: fix for the broken Options -> Contact list -> Contact names dialog

git-svn-id: http://svn.miranda-ng.org/main/trunk@6630 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_modern/src/init.cpp            |  2 +-
 plugins/Clist_modern/src/modern_clcitems.cpp | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'plugins/Clist_modern')

diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp
index ba005f236a..86d22f0929 100644
--- a/plugins/Clist_modern/src/init.cpp
+++ b/plugins/Clist_modern/src/init.cpp
@@ -140,7 +140,7 @@ static HRESULT SubclassClistInterface()
 
 	pcli->pfnCheckCacheItem	= cliCheckCacheItem;
 	pcli->pfnFreeCacheItem = cliFreeCacheItem;
-	pcli->pfnInvalidateDisplayNameCacheEntry	 = cliInvalidateDisplayNameCacheEntry;
+	pcli->pfnInvalidateDisplayNameCacheEntry = cliInvalidateDisplayNameCacheEntry;
 
 	pcli->pfnTrayIconPauseAutoHide = cliTrayIconPauseAutoHide;
 	pcli->pfnTrayCalcChanged       = cliTrayCalcChanged;
diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index 1bcac75ec1..e8dcc382e2 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -641,11 +641,14 @@ ClcCacheEntry* cliCreateCacheItem( HANDLE hContact )
 }
 
 void cliInvalidateDisplayNameCacheEntry(HANDLE hContact)
-{	
-	ClcCacheEntry *p = pcli->pfnGetCacheEntry(hContact);
-	if (p)
-		InvalidateDNCEbyPointer(hContact,p,0);
-	return;
+{
+	if (hContact == INVALID_HANDLE_VALUE)
+		corecli.pfnInvalidateDisplayNameCacheEntry(INVALID_HANDLE_VALUE);
+	else {
+		ClcCacheEntry *p = pcli->pfnGetCacheEntry(hContact);
+		if (p)
+			InvalidateDNCEbyPointer(hContact,p,0);
+	}
 }
 
 char* cli_GetGroupCountsText(ClcData *dat, ClcContact *contact)
-- 
cgit v1.2.3