[cig-commits] commit: Merge.

[Mercurial]

changeset:   725:e5d19017b902
branch:      pcu_rejig
parent:      724:141245be26e4
parent:      722:98ddf19f1f74
user:        JericoRevote
date:        Thu Dec 10 10:53:20 2009 +1100
description:
Merge.


diff -r 141245be26e4 -r e5d19017b902 Base/Context/src/CompositeVC.c
--- a/Base/Context/src/CompositeVC.c	Thu Dec 10 10:49:59 2009 +1100
+++ b/Base/Context/src/CompositeVC.c	Thu Dec 10 10:53:20 2009 +1100
@@ -261,8 +261,8 @@ void _CompositeVC_Destroy(void* composit
 
 	if( self->indepItems ) {
 		for( ii = 0; ii < self->nIndepItems; ii++ )
-			Stg_Class_Delete( self->indepItems[ii] );
-		FreeArray( self->indepItems );
+         _VariableCondition_Delete( self->indepItems[ii]);
+		Memory_Free( self->indepItems );
 	}
 	
 	if (self->itemTbl) {
@@ -270,7 +270,8 @@ void _CompositeVC_Destroy(void* composit
 		
 		for (entry_I = 0; entry_I < self->itemCount; entry_I++) {
 			if (self->iOwnTbl[entry_I] && self->itemTbl[entry_I])
-				Stg_Component_Destroy( self->itemTbl[entry_I], NULL, False );
+				//Stg_Component_Destroy( self->itemTbl[entry_I], NULL, False );
+				_VariableCondition_Delete( self->itemTbl[entry_I]);
 		}
 		Memory_Free(self->itemTbl);
 	}
@@ -278,6 +279,8 @@ void _CompositeVC_Destroy(void* composit
 	if( self->attachedSets ) {
 		Memory_Free( self->attachedSets );
 	}
+
+   Stg_Component_Destroy( self->data, NULL, False );
 
 	_VariableCondition_Destroy( self, data );
 }