From c39949f4b997456d1b373f6cf140f2b07fb9bbed Mon Sep 17 00:00:00 2001 From: himselfv Date: Tue, 9 Oct 2018 10:43:34 +0300 Subject: Fix: Import plugin fails to match duplicate contacts when their IDs are stored as WideChar properties. --- plugins/Import/src/import.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'plugins/Import/src') diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index 1fbd83ce0f..4b4d1e10d2 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -811,6 +811,14 @@ static MCONTACT ImportContact(MCONTACT hSrc) hDst = HContactFromID(szDstModuleName, pszUniqueSetting, pszUniqueID); break; + case DBVT_WCHAR: + pszUniqueID = NEWWSTR_ALLOCA(dbv.pwszVal); + if (bIsChat) + hDst = HContactFromChatID(szDstModuleName, pszUniqueID); + else + hDst = HContactFromID(szDstModuleName, pszUniqueSetting, pszUniqueID); + break; + default: hDst = INVALID_CONTACT_ID; pszUniqueID = nullptr; -- cgit v1.2.3