Changeset 1282 for code/branches/merge/src

Timestamp:

May 15, 2008, 2:14:44 PM (16 years ago)

Author:

scheusso

Message:

made gamestatemanager::cleanup a bit safer

Location:

code/branches/merge/src/network

Files:

• ConnectionManager.cc (modified) (1 diff)
• GameStateManager.cc (modified) (1 diff)

code/branches/merge/src/network/ConnectionManager.cc

@@ -342 +342 @@
     no->setScale(10);
     no->setYawPitchRoll(orxonox::Degree(-90),orxonox::Degree(-90),orxonox::Degree(0));
-    no->setMesh("assf3.mesh");
+    no->setMesh("assff.mesh");
     no->setMaxSpeed(500);
     no->setMaxSideAndBackSpeed(50);

code/branches/merge/src/network/GameStateManager.cc

@@ -84 +84 @@
       if( (*it).second <= 0 ){
         COUT(4) << "GameStateManager: deleting gamestate with id: " << (*it).first << ", uses: " << (*it).second << std::endl;
-        delete[] gameStateMap[(*it).first]->data;
-        delete gameStateMap[(*it).first];
-        gameStateMap.erase((*it).first);
+        std::map<int, GameState *>::iterator tempit = gameStateMap.find((*it).first);
+        if( tempit != gameStateMap.end() ){
+          GameState *temp = tempit->second;
+          if(temp){
+            delete[] gameStateMap[(*it).first]->data;
+            delete gameStateMap[(*it).first];
+            gameStateMap.erase((*it).first);
+          }
+        }
         gameStateUsed.erase(it++);
         continue;