Fix pb with Object Browser update, when several not-loaded components have data....

[modules/gui.git] / src / SUIT / SUIT_DataObject.cxx

diff --git a/src/SUIT/SUIT_DataObject.cxx b/src/SUIT/SUIT_DataObject.cxx
index 877d2480e906b1fdf6a7a0c4006a5e6490f6bf18..7fdc046317f1d9960da3b4f8c1a4525dce3cdbd9 100755 (executable)
--- a/src/SUIT/SUIT_DataObject.cxx
+++ b/src/SUIT/SUIT_DataObject.cxx
@@ -27,12 +27,6 @@ SUIT_DataObject::SUIT_DataObject( SUIT_DataObject* p )
 
 SUIT_DataObject::~SUIT_DataObject()
 {
-  if ( mySignal )
-  {
-    mySignal->emitSignal();
-    mySignal->setOwner( 0 );
-  }
-
   SUIT_DataObject* p = myParent;
 
   myParent = 0;
@@ -40,6 +34,12 @@ SUIT_DataObject::~SUIT_DataObject()
   if ( p )
     p->removeChild( this );
 
+  if ( mySignal )
+  {
+    mySignal->emitSignal();
+    mySignal->setOwner( 0 );
+  }
+
   for ( QPtrListIterator<SUIT_DataObject> it( myChildren ); it.current(); ++it )
     it.current()->myParent = 0;
 
@@ -485,6 +485,9 @@ myOwner( o )
 {
 }
 
+/*!
+  Destructor.
+*/
 SUIT_DataObject::Signal::~Signal()
 {
   SUIT_DataObject* o = myOwner;
@@ -496,11 +499,17 @@ SUIT_DataObject::Signal::~Signal()
   }
 }
 
+/*!
+  Set owner \a o.
+*/
 void SUIT_DataObject::Signal::setOwner( SUIT_DataObject* o )
 {
   myOwner = o;
 }
 
+/*!
+  emit signal destroed owner.
+*/
 void SUIT_DataObject::Signal::emitSignal()
 {
   if ( myOwner )