Changeset 5877 for code/branches/core5/src/orxonox/LevelManager.cc

Timestamp:

Oct 5, 2009, 1:34:10 AM (16 years ago)

Author:

rgrieder

Message:

Added new an option for the ScopedSingletonManager that can allow the Singleton to fail (throw an exception).
Also improved exception-safety in Scope so that when for a Singleton fails, the Scope will deactivate all activated listeners and properly destroy itself.

File:

• code/branches/core5/src/orxonox/LevelManager.cc (modified) (1 diff)

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

@@ -44 +44 @@
     SetCommandLineArgument(level, "").shortcut("l").information("Default level file (overrides LevelManager::defaultLevelName_ configValue)");
 
-    ManageScopedSingleton(LevelManager, ScopeID::Root);
     LevelManager* LevelManager::singletonPtr_s = 0;
+    ManageScopedSingleton(LevelManager, ScopeID::Root, false);
 
     LevelManager::LevelManager()