diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-03-07 14:35:21 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-03-07 14:35:21 +0000 |
| commit | 574ce873c3b0eb608186c03af324d841f32465a6 (patch) | |
| tree | 332648d8df077d036866e6a6424095f4f603f902 /plugins | |
| parent | 4036e52a03cba9c3bd345796407a851153377279 (diff) | |
fix for mc history merge
git-svn-id: http://svn.miranda-ng.org/main/trunk@8446 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Db3x_mmap/src/dbcontacts.cpp | 1 | ||||
| -rw-r--r-- | plugins/Db3x_mmap/src/dbevents.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
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;
|