From 9393a87b150f75ae5bf018790a2cd5096600d90e Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 23 Apr 2015 11:39:36 +0000
Subject: fix for the metacontact's editor

git-svn-id: http://svn.miranda-ng.org/main/trunk@13057 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/metacontacts/meta_edit.cpp |  3 ++-
 src/modules/metacontacts/meta_menu.cpp | 27 ++++++++++++++-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/modules/metacontacts/meta_edit.cpp b/src/modules/metacontacts/meta_edit.cpp
index 7938b398be..fba8032489 100644
--- a/src/modules/metacontacts/meta_edit.cpp
+++ b/src/modules/metacontacts/meta_edit.cpp
@@ -130,7 +130,8 @@ static void ApplyChanges()
 {
 	// remove removed contacts
 	for (int i = 0; i < g_data.num_deleted; i++) {
-		Meta_Delete(g_data.hDeletedContacts[i], 0);
+		if (Meta_Delete(g_data.hDeletedContacts[i], 0) != 0) // error, delete anyway
+			Meta_RemoveContactNumber(g_data.cc, Meta_GetContactNumber(g_data.cc, g_data.hDeletedContacts[i]), true);
 		if (g_data.hDeletedContacts[i] == g_data.hDefaultContact)
 			g_data.hDefaultContact = 0;
 		if (g_data.hDeletedContacts[i] == g_data.hOfflineContact)
diff --git a/src/modules/metacontacts/meta_menu.cpp b/src/modules/metacontacts/meta_menu.cpp
index af8a2177f6..3ecbf8481c 100644
--- a/src/modules/metacontacts/meta_menu.cpp
+++ b/src/modules/metacontacts/meta_menu.cpp
@@ -93,15 +93,14 @@ void Meta_RemoveContactNumber(DBCachedContact *ccMeta, int number, bool bUpdateI
 
 	// make sure this contact thinks it's part of this metacontact
 	DBCachedContact *ccSub = currDb->m_cache->GetCachedContact(Meta_GetContactHandle(ccMeta, number));
-	if (ccSub == NULL)
-		return;
-
-	if (ccSub->parentID == ccMeta->contactID) {
-		db_unset(ccSub->contactID, "CList", "Hidden");
+	if (ccSub != NULL) {
+		if (ccSub->parentID == ccMeta->contactID) {
+			db_unset(ccSub->contactID, "CList", "Hidden");
 
-		// stop ignoring, if we were
-		if (options.bSuppressStatus)
-			CallService(MS_IGNORE_UNIGNORE, ccSub->contactID, IGNOREEVENT_USERONLINE);
+			// stop ignoring, if we were
+			if (options.bSuppressStatus)
+				CallService(MS_IGNORE_UNIGNORE, ccSub->contactID, IGNOREEVENT_USERONLINE);
+		}
 	}
 
 	// each contact from 'number' upwards will be moved down one
@@ -133,10 +132,12 @@ void Meta_RemoveContactNumber(DBCachedContact *ccMeta, int number, bool bUpdateI
 	mir_snprintf(buffer, SIZEOF(buffer), "CListName%d", id);
 	db_unset(ccMeta->contactID, META_PROTO, buffer);
 
-	ccSub->parentID = 0;
-	currDb->MetaDetouchSub(ccMeta, ccMeta->nSubs - 1);
+	if (ccSub != NULL) {
+		ccSub->parentID = 0;
+		currDb->MetaDetouchSub(ccMeta, ccMeta->nSubs - 1);
 
-	currDb->MetaSplitHistory(ccMeta, ccSub);
+		currDb->MetaSplitHistory(ccMeta, ccSub);
+	}
 
 	// if the default contact was equal to or greater than 'number', decrement it (and deal with ends)
 	if (ccMeta->nDefault >= number) {
@@ -183,7 +184,7 @@ INT_PTR Meta_Delete(WPARAM hContact, LPARAM bSkipQuestion)
 {
 	DBCachedContact *cc = currDb->m_cache->GetCachedContact(hContact);
 	if (cc == NULL)
-		return 0;
+		return 1;
 
 	// The wParam is a metacontact
 	if (cc->IsMeta()) {
@@ -202,7 +203,7 @@ INT_PTR Meta_Delete(WPARAM hContact, LPARAM bSkipQuestion)
 	}
 	else if (cc->IsSub()) {
 		if ((cc = currDb->m_cache->GetCachedContact(cc->parentID)) == NULL)
-			return 0;
+			return 2;
 
 		if (cc->nSubs == 1) {
 			if (IDYES == MessageBox(0, TranslateT(szDelMsg), TranslateT("Delete metacontact?"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON1))
-- 
cgit v1.2.3