From 78dc54f9e392b45492a2b726d6268c41f594eb41 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 8 Apr 2014 17:54:19 +0000 Subject: bunch of mc related fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@8892 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdmsg/src/msgdialog.cpp | 2 +- src/mir_core/mc.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 2ae13f2707..7032a1478c 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -1108,7 +1108,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dat->wStatus = db_get_w(dat->hContact, dat->szProto, "Status", ID_STATUS_OFFLINE); contactName = pcli->pfnGetContactDisplayName(dat->hContact, 0); - if (strcmp(dat->szProto, "MetaContacts")) { + if (strcmp(dat->szProto, META_PROTO)) { CONTACTINFO ci = { 0 }; ci.cbSize = sizeof(ci); ci.hContact = dat->hContact; diff --git a/src/mir_core/mc.cpp b/src/mir_core/mc.cpp index 289e29e188..90e967fa98 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(BOOL) db_mc_isMeta(MCONTACT hContact) { - if (currDb == NULL) return FALSE; + if (currDb == NULL || !g_bEnabled) return FALSE; DBCachedContact *cc = currDb->m_cache->GetCachedContact(hContact); return (cc == NULL) ? FALSE : cc->nSubs != -1; @@ -82,7 +82,7 @@ MIR_CORE_DLL(BOOL) db_mc_isMeta(MCONTACT hContact) MIR_CORE_DLL(BOOL) db_mc_isSub(MCONTACT hContact) { - if (currDb == NULL) return FALSE; + if (currDb == NULL || !g_bEnabled) return FALSE; DBCachedContact *cc = currDb->m_cache->GetCachedContact(hContact); return (cc == NULL) ? FALSE : cc->parentID != 0; -- cgit v1.2.3