From 574ce873c3b0eb608186c03af324d841f32465a6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 7 Mar 2014 14:35:21 +0000 Subject: fix for mc history merge git-svn-id: http://svn.miranda-ng.org/main/trunk@8446 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Db3x_mmap/src/dbcontacts.cpp | 1 + plugins/Db3x_mmap/src/dbevents.cpp | 1 + 2 files changed, 2 insertions(+) (limited to 'plugins/Db3x_mmap/src') diff --git a/plugins/Db3x_mmap/src/dbcontacts.cpp b/plugins/Db3x_mmap/src/dbcontacts.cpp index 13a266f33d..3277114de6 100644 --- a/plugins/Db3x_mmap/src/dbcontacts.cpp +++ b/plugins/Db3x_mmap/src/dbcontacts.cpp @@ -257,6 +257,7 @@ BOOL CDb3Mmap::MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub) if (pev->signature != DBEVENT_SIGNATURE) // broken chain, don't touch it return 2; + pev->contactID = ccSub->contactID; arEvents.insert(pev); ofsSub = pev->ofsNext; } diff --git a/plugins/Db3x_mmap/src/dbevents.cpp b/plugins/Db3x_mmap/src/dbevents.cpp index 9cf7fd68b6..f7c8876258 100644 --- a/plugins/Db3x_mmap/src/dbevents.cpp +++ b/plugins/Db3x_mmap/src/dbevents.cpp @@ -42,6 +42,7 @@ STDMETHODIMP_(HANDLE) CDb3Mmap::AddEvent(MCONTACT contactID, DBEVENTINFO *dbei) DBEvent dbe; dbe.signature = DBEVENT_SIGNATURE; + dbe.contactID = contactID; dbe.timestamp = dbei->timestamp; dbe.flags = dbei->flags; dbe.wEventType = dbei->eventType; -- cgit v1.2.3