diff options
| author | himselfv <me@boku.ru> | 2018-10-09 10:43:34 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-10-10 13:07:53 +0300 |
| commit | c39949f4b997456d1b373f6cf140f2b07fb9bbed (patch) | |
| tree | 2a86a50371e6058d80f953b455b7cfcf3837e0a3 | |
| parent | 063c5fe321ebfc53cae8c0d8902fa928c96dc7c9 (diff) | |
Fix: Import plugin fails to match duplicate contacts when their IDs are stored as WideChar properties.
| -rw-r--r-- | plugins/Import/src/import.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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;
|