Changeset 2990 for code/branches/netp3/src/network/synchronisable/NetworkCallbackManager.cc

Timestamp:

May 19, 2009, 9:35:10 PM (15 years ago)

Author:

scheusso

Message:

merged netp2 → netp3

Location:

code/branches/netp3

Files:

• . (modified) (1 prop)
• src/network/synchronisable/NetworkCallbackManager.cc (modified) (2 diffs)

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