Changeset 7999 for code/branches

Timestamp:

Feb 28, 2011, 5:05:02 AM (14 years ago)

Author:

rgrieder

Message:

Fixing leaks:

• Loading a level and then unloading it doesn't destroy the Namespace objects —> unload everything while compiling the level list
• Delete duplicate LevelInfoItems instead of dropping them

File:

• code/branches/usability/src/orxonox/LevelManager.cc (modified) (2 diffs)

code/branches/usability/src/orxonox/LevelManager.cc

@@ -268 +268 @@
 
                 // We don't need the loaded stuff anymore
-                Loader::unload(&file, mask);
+                Loader::unload(&file);
 
                 if(info == NULL) 
@@ -279 +279 @@
                 // Warn about multiple items so that it gets fixed quickly
                 if(availableLevels_.find(info) != availableLevels_.end())
+                {
                     COUT(2) << "Warning: Multiple levels with name '" << info->getName() << "' found!" << std::endl;
-
-                this->availableLevels_.insert(info);
+                    // Delete LevelInfoItem to avoid a dangling pointer
+                    delete info;
+                }
+                else
+                    this->availableLevels_.insert(info);
             }
         }