Changeset 8297 for code/trunk/src/orxonox/interfaces/PickupCarrier.cc

Timestamp:

Apr 22, 2011, 5:59:40 PM (13 years ago)

Author:

dafrick

Message:

Possible bug fix in PickupCarrier.

File:

• code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) (1 diff)

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

@@ -66 +66 @@
     {
         std::set<Pickupable*>::iterator it = this->pickups_.begin();
-        std::set<Pickupable*>::iterator temp;
+        Pickupable* temp;
+        // Iterate over all pickups that are attached to this PickupCarrier and destroy them.
         while(it != this->pickups_.end())
         {
+            temp = *it;
             (*it)->carrierDestroyed();
-            temp = it;
             it = this->pickups_.begin();
-            if(it == temp) // Infinite loop avoidance, in case the pickup wasn't removed from the carrier somewhere in the carrierDestroy() procedure.
+            if(temp == *it) // Infinite loop avoidance, in case the pickup wasn't removed from the carrier somewhere in the carrierDestroy() procedure.
             {
-                COUT(2) << "Oops. In a PickupCarrier, while cleaning up, a Pickupable (&" << (*temp) << ") didn't unregister itself as it should have." << std::endl;;
+                COUT(2) << "Oops. In a PickupCarrier, while cleaning up, a Pickupable (&" << temp << ") didn't unregister itself as it should have." << std::endl;;
                 it++;
             }