Changeset 5214 in orxonox.OLD for trunk/src/lib/coord

Timestamp:

Sep 21, 2005, 8:46:28 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: major fix in PNode/Element2D… the Children were removed twice when deleting an Instance

File:

• trunk/src/lib/coord/p_node.cc (modified) (4 diffs)

trunk/src/lib/coord/p_node.cc

@@ -78 +78 @@
 PNode::~PNode ()
 {
-  tIterator<PNode>* iterator = this->children->getIterator();
-  PNode* pn = iterator->firstElement();
-  while( pn != NULL)
-    {
-      delete pn;
-      pn = iterator->nextElement();
-    }
-  delete iterator;
-  /* this deletes all children in the list */
-  delete this->children;
   if (this->parent)
     this->parent->removeChild(this);
-
+  else
+  {
+   tIterator<PNode>* iterator = this->children->getIterator();
+   PNode* pn = iterator->firstElement();
+   while( pn != NULL)
+     {
+       delete pn;
+       pn = iterator->nextElement();
+     }
+   delete iterator;
+   /* this deletes all children in the list */
+  }
+  delete this->children;
   if (this->toCoordinate != NULL)
     delete this->toCoordinate;
@@ -422 +424 @@
 void PNode::removeChild (PNode* child)
 {
-  child->remove();
-  this->children->remove(child);
-  child->parent = NULL;
+  if (child != NULL)
+  {
+   child->remove();
+//   this->children->remove(child);
+//   child->parent = NULL;
+  }
 }
 
@@ -434 +439 @@
 void PNode::remove()
 {
-  NullParent* nullParent = NullParent::getInstance();
-
   tIterator<PNode>* iterator = this->children->getIterator();
   PNode* pn = iterator->firstElement();
@@ -441 +444 @@
   while( pn != NULL)
     {
-      nullParent->addChild(pn, pn->getParentMode());
+      NullParent::getInstance()->addChild(pn, pn->getParentMode());
       pn = iterator->nextElement();
     }
   delete iterator;
-  this->parent->children->remove(this);
+  if (this->parent != NULL)
+    this->parent->children->remove(this);
 }