crash fix for adding the first sub into a meta

git-svn-id: http://svn.miranda-ng.org/main/trunk@9116 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 12 insertions, 12 deletions

diff --git a/plugins/Db3x_mmap/src/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp
index c77889bdf3..f87eb3b221 100644
--- a/plugins/Db3x_mmap/src/dbsettings.cpp
+++ b/plugins/Db3x_mmap/src/dbsettings.cpp
@@ -223,7 +223,7 @@ LBL_Seek:
 	}

 

 	// try to get the missing mc setting from the active sub

-	if (cc && cc->IsMeta()) {

+	if (cc && cc->IsMeta() && strcmp(szModule, "CList")) {

 		contactID = db_mc_getDefault(contactID);

 		goto LBL_Seek;

 	}

diff --git a/src/modules/metacontacts/meta_utils.cpp b/src/modules/metacontacts/meta_utils.cpp
index a0f1a61559..904ea8407a 100644
--- a/src/modules/metacontacts/meta_utils.cpp
+++ b/src/modules/metacontacts/meta_utils.cpp
@@ -115,9 +115,9 @@ BOOL Meta_Assign(MCONTACT hSub, MCONTACT hMeta, BOOL set_as_default)
 	}

 

 	// write the contact's protocol

-	int id = ccDest->nSubs++;

+	int id = ccDest->nSubs + 1;

 	char buffer[512];

-	mir_snprintf(buffer, SIZEOF(buffer),"Protocol%d",id);

+	mir_snprintf(buffer, SIZEOF(buffer), "Protocol%d", id);

 	if (db_set_s(hMeta, META_PROTO, buffer, szProto)) {

 		MessageBox(0, TranslateT("Could not write contact protocol to MetaContact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		db_free(&dbv);

@@ -125,7 +125,7 @@ BOOL Meta_Assign(MCONTACT hSub, MCONTACT hMeta, BOOL set_as_default)
 	}

 

 	// write the login

-	mir_snprintf(buffer, SIZEOF(buffer),"Login%d",id);

+	mir_snprintf(buffer, SIZEOF(buffer), "Login%d", id);

 	if (db_set(hMeta, META_PROTO, buffer, &dbv)) {

 		MessageBox(0, TranslateT("Could not write unique ID of contact to MetaContact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		db_free(&dbv);

@@ -137,7 +137,7 @@ BOOL Meta_Assign(MCONTACT hSub, MCONTACT hMeta, BOOL set_as_default)
 	// If we can get the nickname of the subcontact...

 	if (!db_get(hSub, szProto, "Nick", &dbv)) {

 		// write the nickname

-		mir_snprintf(buffer, SIZEOF(buffer),"Nick%d",id);

+		mir_snprintf(buffer, SIZEOF(buffer), "Nick%d", id);

 		if (db_set(hMeta, META_PROTO, buffer, &dbv)) {

 			MessageBox(0, TranslateT("Could not write nickname of contact to MetaContact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 			db_free(&dbv);

@@ -148,22 +148,22 @@ BOOL Meta_Assign(MCONTACT hSub, MCONTACT hMeta, BOOL set_as_default)
 	}

 

 	// write the display name

-	mir_snprintf(buffer, SIZEOF(buffer),"CListName%d",id);

+	mir_snprintf(buffer, SIZEOF(buffer), "CListName%d", id);

 	db_set_ts(hMeta, META_PROTO, buffer, cli.pfnGetContactDisplayName(hSub, 0));

 

 	// Get the status

 	WORD status = (!szProto) ? ID_STATUS_OFFLINE : db_get_w(hSub, szProto, "Status", ID_STATUS_OFFLINE);

 

 	// write the status

-	mir_snprintf(buffer, SIZEOF(buffer),"Status%d",id);

+	mir_snprintf(buffer, SIZEOF(buffer), "Status%d", id);

 	db_set_w(hMeta, META_PROTO, buffer, status);

 

 	// write the handle

-	mir_snprintf(buffer, SIZEOF(buffer),"Handle%d",id);

+	mir_snprintf(buffer, SIZEOF(buffer), "Handle%d", id);

 	db_set_dw(hMeta, META_PROTO, buffer, hSub);

 

 	// write status string

-	mir_snprintf(buffer, SIZEOF(buffer),"StatusString%d",id);

+	mir_snprintf(buffer, SIZEOF(buffer), "StatusString%d", id);

 

 	TCHAR *szStatus = cli.pfnGetStatusModeDescription(status, 0);

 	db_set_ts(hMeta, META_PROTO, buffer, szStatus);

@@ -173,9 +173,9 @@ BOOL Meta_Assign(MCONTACT hSub, MCONTACT hMeta, BOOL set_as_default)
 	db_set_b(hSub, META_PROTO, "IsSubcontact", true);

 

 	// update count of contacts

-	db_set_dw(hMeta, META_PROTO, "NumContacts", ccDest->nSubs);

-	ccDest->pSubs = (MCONTACT*)mir_realloc(ccDest->pSubs, sizeof(MCONTACT)*ccDest->nSubs);

-	ccDest->pSubs[ccDest->nSubs - 1] = hSub;

+	db_set_dw(hMeta, META_PROTO, "NumContacts", id);

+	ccDest->pSubs = (MCONTACT*)mir_realloc(ccDest->pSubs, sizeof(MCONTACT)*id);

+	ccDest->pSubs[ccDest->nSubs++] = hSub;

 	ccSub->parentID = hMeta;

 

 	if (set_as_default)