fix duplicate subcocntacts when importing (reset metaMap before modules loaded)

fix to binary tree node deletion

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@349 4f64403b-2f21-0410-a795-97e2b3489a10

1 files changed, 2 insertions, 1 deletions

diff --git a/meta2/collection.h b/meta2/collection.h
index 725bb1d..af0f781 100644
--- a/meta2/collection.h
+++ b/meta2/collection.h
@@ -361,6 +361,7 @@ protected:
 		} else {

 			if(n == root) root = 0;

 		}

+		n->parent = 0;

 		delete n;

 		Collection<T>::count--;

 		return 0;

@@ -580,7 +581,7 @@ public:
 	virtual const bool remove(A &key) {

 		TreeNode<Pair< A, B > > *n = find(key);

 		if(n) {

-			delete_node(n);

+			BinaryTree< Pair< A, B > >::remove(n->val);

 			return true;

 		} else

 			return false;