From cb433a48f6562a49695f77ea2e39f8a5592c8822 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 20 Mar 2014 19:29:01 +0000 Subject: disabling metacontacts: fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@8668 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/mir_core/mc.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mir_core') diff --git a/src/mir_core/mc.cpp b/src/mir_core/mc.cpp index 57b91eb367..e440160dc0 100644 --- a/src/mir_core/mc.cpp +++ b/src/mir_core/mc.cpp @@ -74,7 +74,7 @@ MIR_CORE_DLL(void) db_mc_enable(BOOL bEnabled) MIR_CORE_DLL(int) db_mc_isMeta(MCONTACT hContact) { - if (currDb == NULL || !g_bEnabled) return false; + if (currDb == NULL) return false; DBCachedContact *cc = currDb->m_cache->GetCachedContact(hContact); return (cc == NULL) ? false : cc->nSubs != -1; @@ -82,7 +82,7 @@ MIR_CORE_DLL(int) db_mc_isMeta(MCONTACT hContact) MIR_CORE_DLL(int) db_mc_isSub(MCONTACT hContact) { - if (currDb == NULL || !g_bEnabled) return false; + if (currDb == NULL) return false; DBCachedContact *cc = currDb->m_cache->GetCachedContact(hContact); return (cc == NULL) ? false : cc->parentID != 0; @@ -115,7 +115,7 @@ MIR_CORE_DLL(int) db_mc_getSubCount(MCONTACT hMetaContact) // returns parent hContact for a subcontact or INVALID_CONTACT_ID if it's not a sub MIR_CORE_DLL(MCONTACT) db_mc_getMeta(MCONTACT hSubContact) { - if (currDb == NULL || !g_bEnabled) return false; + if (currDb == NULL) return false; DBCachedContact *cc = currDb->m_cache->GetCachedContact(hSubContact); return (cc == NULL) ? NULL : cc->parentID; -- cgit v1.2.3