diff options
| -rw-r--r-- | plugins/Import/src/import.cpp | 3 | ||||
| -rw-r--r-- | plugins/Import/src/version.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index 94ec735979..5f5f322307 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -416,7 +416,7 @@ DBCachedContact* FindDestMeta(DBCachedContact *ccSrc) int i;
for (i = 0; i < ccSrc->nSubs; i++) {
MCONTACT hDest = MapContact(ccSrc->pSubs[i]);
- if (hDest == INVALID_CONTACT_ID || ccSrc->pSubs[i] != hDest)
+ if (hDest == INVALID_CONTACT_ID || cc->pSubs[i] != hDest)
break;
}
@@ -540,6 +540,7 @@ static MCONTACT ImportContact(MCONTACT hSrc) if (hDst != INVALID_CONTACT_ID) {
AddMessage(LPGENT("Skipping duplicate %S contact %s"), cc->szProto, pszUniqueID);
srcDb->FreeVariant(&dbv);
+ arContactMap.insert(new ContactMap(hSrc, hDst));
return NULL;
}
diff --git a/plugins/Import/src/version.h b/plugins/Import/src/version.h index dda2b434ea..d2ab9dffe9 100644 --- a/plugins/Import/src/version.h +++ b/plugins/Import/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0
#define __MINOR_VERSION 95
#define __RELEASE_NUM 3
-#define __BUILD_NUM 2
+#define __BUILD_NUM 3
#include <stdver.h>
|