summaryrefslogtreecommitdiff
path: root/plugins/Clist_modern/src/modern_clc.cpp
diff options
context:
space:
mode:
authorRobert Pösel <robyer@seznam.cz>2013-06-19 21:21:55 +0000
committerRobert Pösel <robyer@seznam.cz>2013-06-19 21:21:55 +0000
commit4ed0511b76ed05345d82933767ed0a0cf3285440 (patch)
tree78ac729d7886592fecea786ac11f084912c7a449 /plugins/Clist_modern/src/modern_clc.cpp
parentc797ebe33b5e5ad929392be428090708df42321b (diff)
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
Diffstat (limited to 'plugins/Clist_modern/src/modern_clc.cpp')
-rw-r--r--plugins/Clist_modern/src/modern_clc.cpp14
1 files changed, 8 insertions, 6 deletions
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;
}