Changeset 3356 in orxonox.OLD for orxonox/branches/parenting/src/track_manager.cc

Timestamp:

Jan 6, 2005, 2:10:38 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: TrackManager: now deletes without segfault . . . | silly, that i did not think of Joins, and that they delete all preceding stuff, even if it was already deleted.

File:

• orxonox/branches/parenting/src/track_manager.cc (modified) (3 diffs)

orxonox/branches/parenting/src/track_manager.cc

@@ -33 +33 @@
   this->isFork = false;
   this->isJoined = false;
+  this->mainJoin = false;
   this->cond; //!< todo think!!
   this->ID = -1;
@@ -57 +58 @@
   if (this->curve)
     delete this->curve;
-  if (this->childCount > 0)
+  if ((!this->isJoined &&this->childCount > 0) || (this->isJoined && this->mainJoin))
     {
       for (int i=0; i < this->childCount; i++)
         delete this->children[i];
-    }
-  if (children)
-    delete children;
+      delete this->children;
+    }
 }
 
@@ -384 +384 @@
   Vector tmpTangentPoint = firstJoint->curve->getNode(firstJoint->curve->getNodeCount()-1); 
   firstJoint->isJoined = true;
+  firstJoint->mainJoin = true;
   if(!firstJoint->isHotPoint)
     this->setSavePoint();