diff options
| author | George Hazan <ghazan@miranda.im> | 2021-04-30 17:52:29 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-04-30 17:52:29 +0300 |
| commit | 9f00802dfbad293235fc44536069c64b236fdc50 (patch) | |
| tree | d6d337bdc9334c5516e30f83d5edf9f742be2f35 /plugins | |
| parent | 84f2722e07a23656bdc8d1a7f4040e86450fe91d (diff) | |
fixes #2859 (Импорт: дублируются контакты ICQ и FaceBook)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Import/src/import.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index f1e270eac7..ca3e78f33c 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -792,18 +792,18 @@ MCONTACT CImportBatch::ImportContact(MCONTACT hSrc) return 0;
}
- if (Proto_AddToContact(hDst, szDstModuleName) != 0) {
- db_delete_contact(hDst);
- AddMessage(LPGENW("Failed to add %S contact %s"), szDstModuleName, pszUniqueID);
- return INVALID_CONTACT_ID;
- }
-
if (dbv.type == 0)
srcDb->GetContactSetting(hSrc, cc->szProto, "ID", &dbv);
if (dbv.type != 0)
db_set(hDst, szDstModuleName, pszUniqueSetting, &dbv);
+ if (Proto_AddToContact(hDst, szDstModuleName) != 0) {
+ db_delete_contact(hDst);
+ AddMessage(LPGENW("Failed to add %S contact %s"), szDstModuleName, pszUniqueID);
+ return INVALID_CONTACT_ID;
+ }
+
CreateGroup(tszGroup, hDst);
if (tszNick && *tszNick) {
|