Changeset 6533 for code/trunk/src/orxonox

Timestamp:

Mar 16, 2010, 10:49:35 AM (15 years ago)

Author:

dafrick

Message:

Resolved segmentation fault, when destroying a PickupCompilation.

Location:

code/trunk/src/orxonox/interfaces

Files:

• InterfaceCompilation.cc (modified) (1 diff)
• PickupCarrier.h (modified) (1 diff)
• Pickupable.h (modified) (1 diff)

code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -64 +64 @@
     PickupCarrier::~PickupCarrier()
     {
-        for(std::set<Pickupable*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
+        while(this->pickups_.size() > 0)
         {
+            std::set<Pickupable*>::iterator it = this->pickups_.begin();
+            this->pickups_.erase(it);
             (*it)->destroy();
         }
-        
+
         this->pickups_.clear();
     }

code/trunk/src/orxonox/interfaces/PickupCarrier.h

@@ -41 +41 @@
 #include "Pickupable.h"
 #include "core/Identifier.h"
+#include "core/WeakPtr.h"
 
 #include "core/OrxonoxClass.h"

code/trunk/src/orxonox/interfaces/Pickupable.h

@@ -114 +114 @@
                 { return this->pickupIdentifier_; }
                 
-            virtual void destroy(void)
-                { delete this; }
-                
             //TODO: Make them work as protected.
             bool setUsed(bool used); //!< Sets the Pickupable to used or unused, depending on the input.