Changeset 2833

Timestamp:

Mar 23, 2009, 4:15:33 PM (16 years ago)

Author:

scheusso

Message:

some bugfixes (client crashed when server was killed 2 times)

Location:

code/branches/netp/src

Files:

• network/synchronisable/NetworkCallbackManager.cc (modified) (2 diffs)
• orxonox/objects/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/netp/src/network/synchronisable/NetworkCallbackManager.cc

@@ -32 +32 @@
 
 namespace orxonox{
-
+  
   std::set<NetworkCallbackBase*> NetworkCallbackManager::callbackSet_;
   std::queue<NetworkCallbackBase*> NetworkCallbackManager::triggeredCallbacks_;
@@ -60 +60 @@
     while( triggeredCallbacks_.empty()==false )
     {
-      triggeredCallbacks_.front()->call();
+      //make sure callback hasn't been deleted before
+      if ( callbackSet_.find(triggeredCallbacks_.front()) != callbackSet_.end() )
+        triggeredCallbacks_.front()->call();
       triggeredCallbacks_.pop();
     }

code/branches/netp/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -129 +129 @@
         this->firehack_ = 0x0;
 
-        if (this->health_ <= 0)
+        if (Core::isMaster())
+          if (this->health_ <= 0)
             this->death();
     }