Changeset 5214 in orxonox.OLD for trunk/src/lib/graphics/render2D/element_2d.cc

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/graphics/render2D/element_2d.cc (modified) (3 diffs)

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -54 +54 @@
   Render2D::getInstance()->unregisterElement2D(this);
 
-  tIterator<Element2D>* iterator = this->children->getIterator();
-  Element2D* 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->removeChild2D(this);
+  else
+  {
+    tIterator<Element2D>* iterator = this->children->getIterator();
+    Element2D* 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)
@@ -470 +473 @@
   {
     child->remove2D();
-    this->children->remove(child);
-    child->parent = NULL;
+//    this->children->remove(child);
+//    child->parent = NULL;
   }
 }
@@ -491 +494 @@
   }
   delete iterator;
-  this->parent->children->remove(this);
+  if (this->parent != NULL)
+    this->parent->children->remove(this);
 }