Changeset 8667 for code/branches/presentation/src/modules/docking/Dock.cc

Timestamp:

May 29, 2011, 6:44:45 PM (13 years ago)

Author:

dafrick

Message:

Possible fix for segfaults due to player being NULL.

File:

• code/branches/presentation/src/modules/docking/Dock.cc (modified) (3 diffs)

code/branches/presentation/src/modules/docking/Dock.cc

@@ -84 +84 @@
     {
         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
-        Pawn* pawn = NULL;
+        PlayerInfo* player = NULL;
 
         // Check whether it is a player trigger and extract pawn from it
@@ -93 +93 @@
                 return false;
             }
-            pawn = pTrigger->getTriggeringPlayer();
+            player = pTrigger->getTriggeringPlayer();
         }
         else
@@ -100 +100 @@
             return false;
         }
-        if(pawn == NULL)
-        {
-            COUT(4) << "Docking::execute Can't retrieve Pawn from Trigger. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
-            return false;
-        }
-
-        // Extract the PlayerInfo from the Pawn.
-        PlayerInfo* player = pawn->getPlayer();
         if(player == NULL)
         {
-            COUT(2) << "Docking::execute The PlayerInfo* is NULL." << std::endl;
+            COUT(4) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
             return false;
         }