From 5d6f37cc9bf8e26ff3ac68449e05212258a6b6a9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Mar 2014 17:10:36 +0000 Subject: fix for dbchecker git-svn-id: http://svn.miranda-ng.org/main/trunk@8547 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Db3x_mmap/src/dbtool/eventchain.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'plugins/Db3x_mmap/src/dbtool/eventchain.cpp') 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; -- cgit v1.2.3