Changeset 6034 for code/branches/console/src/libraries/core/ScopedSingletonManager.h

Timestamp:

Nov 5, 2009, 8:16:13 AM (14 years ago)

Author:

rgrieder

Message:

Fixed program termination segfault

File:

• code/branches/console/src/libraries/core/ScopedSingletonManager.h (modified) (3 diffs)

code/branches/console/src/libraries/core/ScopedSingletonManager.h

@@ -52 +52 @@
             virtual ~ScopedSingletonManager() { }
             static void addManager(ScopedSingletonManager* manager);
-            static void removeManager(ScopedSingletonManager* manager);
 
             template<ScopeID::Value scope>
@@ -86 +85 @@
         ~ClassScopedSingletonManager()
         {
-            //assert(singletonPtr_ == NULL); // Might get triggered in the SignalHandler
-            ScopedSingletonManager::removeManager(this);
         }
 
@@ -140 +137 @@
         ~ClassScopedSingletonManager()
         {
-            assert(singletonPtr_ == NULL);
-            ScopedSingletonManager::removeManager(this);
         }