diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-03-07 14:53:59 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-03-07 14:53:59 +0000 |
| commit | 836a8bb674bc473559f1a3298a1822d66841c634 (patch) | |
| tree | 0de0e97768a77e744711f3ec91a9a0e8b4a73a68 /plugins/Db3x_mmap | |
| parent | 83cf0514b2f7a463c92444258fa0b8752d9e2cd9 (diff) | |
DBEvent::contactID check moved to dbchecker
git-svn-id: http://svn.miranda-ng.org/main/trunk@8449 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Db3x_mmap')
| -rw-r--r-- | plugins/Db3x_mmap/src/dbcontacts.cpp | 1 | ||||
| -rw-r--r-- | plugins/Db3x_mmap/src/dbtool/eventchain.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/plugins/Db3x_mmap/src/dbcontacts.cpp b/plugins/Db3x_mmap/src/dbcontacts.cpp index 1fba90777f..4c2d03f758 100644 --- a/plugins/Db3x_mmap/src/dbcontacts.cpp +++ b/plugins/Db3x_mmap/src/dbcontacts.cpp @@ -263,7 +263,6 @@ BOOL CDb3Mmap::MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub) __leave;
}
- pev->contactID = ccSub->contactID;
arEvents.insert(pev);
ofsSub = pev->ofsNext;
}
diff --git a/plugins/Db3x_mmap/src/dbtool/eventchain.cpp b/plugins/Db3x_mmap/src/dbtool/eventchain.cpp index ff5defe281..453ec15d33 100644 --- a/plugins/Db3x_mmap/src/dbtool/eventchain.cpp +++ b/plugins/Db3x_mmap/src/dbtool/eventchain.cpp @@ -186,6 +186,9 @@ int CDb3Mmap::WorkEventChain(DWORD ofsContact, DBContact *dbc, int firstTime) dbeOld.flags &= ~DBEF_FIRST;
}
+ if (dbeOld.contactID == 0)
+ dbeOld.contactID = dbc->dwContactID;
+
if (dbeOld.flags & ~DBEF_ALL) {
cb->pfnAddLogMessage(STATUS_WARNING, TranslateT("Extra flags found in event: removing"));
dbeOld.flags &= DBEF_ALL;
|