Changeset 8300

Timestamp:

Apr 22, 2011, 6:32:29 PM (14 years ago)

Author:

dafrick

Message:

Apparently bug needs some more fixing.

File:

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

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

@@ -73 +73 @@
             (*it)->carrierDestroyed();
             it = this->pickups_.begin();
-            if(temp == *it) // Infinite loop avoidance, in case the pickup wasn't removed from the carrier somewhere in the carrierDestroy() procedure.
+            if(it != this->pickups_.end() && 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;;