diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-10-16 19:40:47 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-10-16 19:40:47 +0000 |
| commit | ac4a9675eaceb841cea910f4c73563f720787c95 (patch) | |
| tree | c50231d8aba952b498db42f3c2a822e693ff5a03 | |
| parent | f1239aebb7193d2ad246251a11c24efc412ec9f4 (diff) | |
correct dest acccount mapping
git-svn-id: http://svn.miranda-ng.org/main/trunk@10804 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/Import/src/import.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index 779e9c8423..31c5b63d6f 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -196,6 +196,15 @@ void CopySettings(MCONTACT srcID, const char *szSrcModule, MCONTACT dstID, const /////////////////////////////////////////////////////////////////////////////////////////
+static bool FindDestAccount(const char *szProto)
+{
+ for (int i = 0; i < arAccountMap.getCount(); i++)
+ if (!strcmp(arAccountMap[i].szDstAcc, szProto))
+ return true;
+
+ return false;
+}
+
static PROTOACCOUNT* FindMyAccount(const char *szProto, const char *szBaseProto)
{
int destProtoCount;
@@ -206,7 +215,7 @@ static PROTOACCOUNT* FindMyAccount(const char *szProto, const char *szBaseProto) for (int i = 0; i < destProtoCount; i++) {
PROTOACCOUNT *pa = destAccs[i];
// already used? skip
- if (arAccountMap.find((AccountMap*)&pa->szProtoName))
+ if (FindDestAccount(pa->szModuleName))
continue;
// different base protocotol type -> skip
|