diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-03-10 17:10:36 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-03-10 17:10:36 +0000 |
| commit | 5d6f37cc9bf8e26ff3ac68449e05212258a6b6a9 (patch) | |
| tree | 7a72c0f8beeba41567ad2d1d268eed31f3a61bac /plugins/Db3x_mmap/src/dbtool | |
| parent | eccb6b6709bc39d512e14e420d2ba3bd1c4ccbd4 (diff) | |
fix for dbchecker
git-svn-id: http://svn.miranda-ng.org/main/trunk@8547 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Db3x_mmap/src/dbtool')
| -rw-r--r-- | plugins/Db3x_mmap/src/dbtool/eventchain.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/Db3x_mmap/src/dbtool/eventchain.cpp b/plugins/Db3x_mmap/src/dbtool/eventchain.cpp index 3fa324aff9..ee3cb7b854 100644 --- a/plugins/Db3x_mmap/src/dbtool/eventchain.cpp +++ b/plugins/Db3x_mmap/src/dbtool/eventchain.cpp @@ -186,9 +186,6 @@ 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;
@@ -235,9 +232,10 @@ int CDb3Mmap::WorkEventChain(DWORD ofsContact, DBContact *dbc, int firstTime) cb->pfnAddLogMessage(STATUS_WARNING, TranslateT("Event not backlinked correctly: fixing"));
dbeNew->flags = dbeOld.flags;
- dbeNew->contactID = dbc->dwContactID;
dbeNew->ofsPrev = ofsDestPrevEvent;
dbeNew->ofsNext = 0;
+ if (dbeNew->contactID == 0)
+ dbeNew->contactID = dbc->dwContactID;
if (dbeOld.wEventType == EVENTTYPE_MESSAGE && cb->bConvertUtf && !(dbeOld.flags & DBEF_ENCRYPTED)) {
DWORD oldSize = dbeNew->cbBlob;
|