[Orxonox-commit 3199] r7892 - code/trunk/src/orxonox/worldentities

[landauf at orxonox.net]

Author: landauf
Date: 2011-02-14 22:51:44 +0100 (Mon, 14 Feb 2011)
New Revision: 7892

Modified:
   code/trunk/src/orxonox/worldentities/ControllableEntity.cc
Log:
fixed bug in bug fix

Modified: code/trunk/src/orxonox/worldentities/ControllableEntity.cc
===================================================================
--- code/trunk/src/orxonox/worldentities/ControllableEntity.cc	2011-02-14 21:30:01 UTC (rev 7891)
+++ code/trunk/src/orxonox/worldentities/ControllableEntity.cc	2011-02-14 21:51:44 UTC (rev 7892)
@@ -134,7 +134,7 @@
     void ControllableEntity::preDestroy()
     {
         // HACK - solve this clean and without preDestroy hook for multiplayer where removePlayer() isn't called
-        if (this->bHasLocalController_ && this->bHasHumanController_)
+        if (this->isInitialized() && this->bHasLocalController_ && this->bHasHumanController_)
             this->stopLocalHumanControl();
     }