From 4ed0511b76ed05345d82933767ed0a0cf3285440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Wed, 19 Jun 2013 21:21:55 +0000 Subject: Clist Modern: Fixed "show contact even if offline" when he is not in group with enabled "hide offline contacts outside groups" git-svn-id: http://svn.miranda-ng.org/main/trunk@5052 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/modern_clc.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'plugins/Clist_modern') diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index 1663134546..850f6e5df5 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -383,15 +383,17 @@ static int clcSearchNextContact(HWND hwnd, ClcData *dat, int index, const TCHAR static BOOL clcItemNotHiddenOffline(ClcData *dat, ClcGroup* group, ClcContact *contact) { - if (!group || !contact) return FALSE; - if (group->hideOffline) return FALSE; if (g_CluiData.bFilterEffective) return FALSE; - if (CLCItems_IsShowOfflineGroup(group)) return TRUE; - - ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry( contact->hContact); - if ( !pdnce) return FALSE; + if (!contact) return FALSE; + ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(contact->hContact); + if (!pdnce) return FALSE; if (pdnce->m_cache_nNoHiddenOffline) return TRUE; + + if (!group) return FALSE; + if (group->hideOffline) return FALSE; + + if (CLCItems_IsShowOfflineGroup(group)) return TRUE; return FALSE; } -- cgit v1.2.3