[cig-commits] commit: merge again

[Mercurial]

changeset:   730:e8e1af6f0495
branch:      pcu_rejig
parent:      729:f36b9774b3bf
parent:      727:00a70931df12
user:        JulianGiordani
date:        Fri Dec 11 13:26:57 2009 +1100
description:
merge again


diff -r f36b9774b3bf -r e8e1af6f0495 Base/Automation/src/Stg_Component.c
--- a/Base/Automation/src/Stg_Component.c	Fri Dec 11 00:21:01 2009 +1100
+++ b/Base/Automation/src/Stg_Component.c	Fri Dec 11 13:26:57 2009 +1100
@@ -342,7 +342,7 @@ void Stg_Component_Destroy( void* compon
 void Stg_Component_Destroy( void* component, void* data, Bool force ) {
 	Stg_Component* self = (Stg_Component*)component;
 
-	if( /* force TODO: remove this comment after pcu_rejig period|| */ !self->isDestroyed ) {
+	if( /* TODO: once the refCounters are implemented there is no longeer a need to check self|| */ self && !self->isDestroyed ) {
 		/*Stg_TimeMonitor*	tm;
 		Stg_MemMonitor*		mm;
 		char*						buf;