[Orxonox-commit 2843] r7546 - code/trunk/src/modules/pickup/items

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-10-15 08:43:02 +0200 (Fri, 15 Oct 2010)
New Revision: 7546

Modified:
   code/trunk/src/modules/pickup/items/InvisiblePickup.cc
Log:
Ok, this should finally do it.


Modified: code/trunk/src/modules/pickup/items/InvisiblePickup.cc
===================================================================
--- code/trunk/src/modules/pickup/items/InvisiblePickup.cc	2010-10-15 06:35:20 UTC (rev 7545)
+++ code/trunk/src/modules/pickup/items/InvisiblePickup.cc	2010-10-15 06:43:02 UTC (rev 7546)
@@ -133,11 +133,11 @@
         {
             this->setInvisible(false);
 
-            if((!this->isContinuous() && this->isImmediate()) || (!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration()))
+            if((!this->isContinuous() && this->isImmediate()) || (this->isContinuous() && !this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration()))
             {
                 this->Pickupable::destroy();
             }
-            else if(this->durationTimer_.isActive())
+            else if(this->isContinuous() && this->durationTimer_.isActive())
             {
                 this->durationTimer_.pauseTimer();
             }