Changeset 2836 for code/branches/netp2/src/network/synchronisable/NetworkCallbackManager.cc

Timestamp:

Mar 23, 2009, 5:00:54 PM (16 years ago)

Author:

scheusso

Message:

merge old netp branch to netp2 (still because of multiplayer pong…)

File:

• code/branches/netp2/src/network/synchronisable/NetworkCallbackManager.cc (modified) (2 diffs)

code/branches/netp2/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();
     }