[Orxonox-commit 1163] r5884 - code/branches/core5/src/orxonox/graphics

[landauf at orxonox.net]

Author: landauf
Date: 2009-10-05 23:20:42 +0200 (Mon, 05 Oct 2009)
New Revision: 5884

Modified:
   code/branches/core5/src/orxonox/graphics/ParticleSpawner.cc
Log:
fixed a bug in ParticleSpawner which caused it to spawn particles in the first tick even though autostart was set to false.

Modified: code/branches/core5/src/orxonox/graphics/ParticleSpawner.cc
===================================================================
--- code/branches/core5/src/orxonox/graphics/ParticleSpawner.cc	2009-10-05 20:50:19 UTC (rev 5883)
+++ code/branches/core5/src/orxonox/graphics/ParticleSpawner.cc	2009-10-05 21:20:42 UTC (rev 5884)
@@ -90,7 +90,10 @@
         this->setActive(false);
 
         if (this->bForceDestroy_ || this->bSuppressStart_)
+        {
+            this->timer_.stopTimer();
             return;
+        }
 
         this->timer_.setTimer(this->startdelay_, false, createExecutor(createFunctor(&ParticleSpawner::fireParticleSpawner, this)));
     }