From 9f00802dfbad293235fc44536069c64b236fdc50 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 30 Apr 2021 17:52:29 +0300
Subject: =?UTF-8?q?fixes=20#2859=20(=D0=98=D0=BC=D0=BF=D0=BE=D1=80=D1=82:?=
 =?UTF-8?q?=20=D0=B4=D1=83=D0=B1=D0=BB=D0=B8=D1=80=D1=83=D1=8E=D1=82=D1=81?=
 =?UTF-8?q?=D1=8F=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D1=8B=20ICQ?=
 =?UTF-8?q?=20=D0=B8=20FaceBook)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/Import/src/import.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins')

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) {
-- 
cgit v1.2.3