MPV: Merge V1_2d

[modules/superv.git] / src / Supervision / SNode_Impl.cxx

diff --git a/src/Supervision/SNode_Impl.cxx b/src/Supervision/SNode_Impl.cxx
index e716e6012df0c319aa937e636513cda6ba5b4abb..79d244c01f23729b88b18187c228203cb81d453c 100644 (file)
--- a/src/Supervision/SNode_Impl.cxx
+++ b/src/Supervision/SNode_Impl.cxx
@@ -76,12 +76,17 @@ SNode_Impl::~SNode_Impl() {
 void SNode_Impl::destroy() {
   beginService( "SNode_Impl::Destroy" );
   if ( DataFlowEditor()->IsEditing() ) {
+    SUPERV::GNode_ptr aCoupled = SUPERV::GNode::_narrow( Coupled() ) ;
     if ( Delete() ) {
       _poa->deactivate_object(*_id) ;
       CORBA::release(_poa) ;
       delete(_id) ;
       _thisObj->_remove_ref();
     }
+    if ( !CORBA::is_nil( aCoupled ) ) {
+      aCoupled->SetCoupled( "" ) ;
+      aCoupled->destroy() ;
+    }
   }
   endService( "SNode_Impl::Destroy" );
 }