Changeset 9776 for code/branches/spacestationentry/src/orxonox

Timestamp:

Nov 11, 2013, 3:55:34 PM (11 years ago)

Author:

agermann

Message:

Hack - Spacestation Docking mit abdocken funktioniert.

File:

• code/branches/spacestationentry/src/orxonox/infos/PlayerInfo.cc (modified) (1 diff)

code/branches/spacestationentry/src/orxonox/infos/PlayerInfo.cc

@@ -229 +229 @@
             return;
 
-        this->controllableEntity_->getController()->setActive(false);
+        Controller* tmp =this->controllableEntity_->getController();
+        if (tmp == NULL)
+        {
+                orxout(verbose) <<  "PlayerInfo: pauseControl, Controller is NULL " << endl;
+                return;
+        }
+        tmp->setActive(false);
         //this->controllableEntity_->getController()->setControllableEntity(NULL);
         this->controllableEntity_->setController(0);