diff options
author | George Hazan <george.hazan@gmail.com> | 2014-04-08 19:44:08 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2014-04-08 19:44:08 +0000 |
commit | 8ab45308a3e218ac2638ec12f2203c68e11559b5 (patch) | |
tree | d8fa682d9f3ed17046e18efd69ddaa953c7ccc98 | |
parent | 683ca5965e69d1780d957ab6f59b704c612852fa (diff) |
fix for disabled metas & tabSRMM container creation
git-svn-id: http://svn.miranda-ng.org/main/trunk@8894 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r-- | plugins/Db3x_mmap/src/dbevents.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/Db3x_mmap/src/dbevents.cpp b/plugins/Db3x_mmap/src/dbevents.cpp index 66dded5f16..1cdc3bd191 100644 --- a/plugins/Db3x_mmap/src/dbevents.cpp +++ b/plugins/Db3x_mmap/src/dbevents.cpp @@ -46,6 +46,7 @@ STDMETHODIMP_(HANDLE) CDb3Mmap::AddEvent(MCONTACT contactID, DBEVENTINFO *dbei) dbe.cbBlob = dbei->cbBlob;
BYTE *pBlob = dbei->pBlob;
+ MCONTACT contactNotifyID = contactID;
DBCachedContact *ccSub = NULL;
if (contactID != 0) {
DBCachedContact *cc = m_cache->GetCachedContact(contactID);
@@ -57,10 +58,12 @@ STDMETHODIMP_(HANDLE) CDb3Mmap::AddEvent(MCONTACT contactID, DBEVENTINFO *dbei) // set default sub to the event's source
db_mc_setDefault(cc->parentID, contactID);
contactID = cc->parentID; // and add an event to a metahistory
+ if (db_mc_isEnabled())
+ contactNotifyID = contactID;
}
}
- if (NotifyEventHooks(hEventFilterAddedEvent, contactID, (LPARAM)dbei))
+ if (NotifyEventHooks(hEventFilterAddedEvent, contactNotifyID, (LPARAM)dbei))
return NULL;
mir_ptr<BYTE> pCryptBlob;
@@ -154,7 +157,7 @@ STDMETHODIMP_(HANDLE) CDb3Mmap::AddEvent(MCONTACT contactID, DBEVENTINFO *dbei) // Notify only in safe mode or on really new events
if (neednotify)
- NotifyEventHooks(hEventAddedEvent, contactID, (LPARAM)ofsNew);
+ NotifyEventHooks(hEventAddedEvent, contactNotifyID, (LPARAM)ofsNew);
return (HANDLE)ofsNew;
}
|