summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-10-16 17:02:21 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-10-16 17:02:21 +0000
commit86cfb4561560f213ba7dd3ebdc7e033b4cd87941 (patch)
tree3b036371fd06e0c9f9a14592b2d94833d965f9b8
parentc1f9817c88f5e997c09b027de5957423121b3bf2 (diff)
the same account not to be used twice during import
git-svn-id: http://svn.miranda-ng.org/main/trunk@10799 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/Import/src/import.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp
index dca01e591c..779e9c8423 100644
--- a/plugins/Import/src/import.cpp
+++ b/plugins/Import/src/import.cpp
@@ -205,6 +205,11 @@ static PROTOACCOUNT* FindMyAccount(const char *szProto, const char *szBaseProto)
PROTOACCOUNT *pProto = NULL;
for (int i = 0; i < destProtoCount; i++) {
PROTOACCOUNT *pa = destAccs[i];
+ // already used? skip
+ if (arAccountMap.find((AccountMap*)&pa->szProtoName))
+ continue;
+
+ // different base protocotol type -> skip
if (lstrcmpA(pa->szProtoName, szBaseProto))
continue;