Changeset 1058

Timestamp:

Apr 14, 2008, 1:17:10 PM (17 years ago)

Author:

landauf

Message:

something that just came through my mind: maybe this will help preventing a segfault when we'll destroy all singletons after program termination.

Location:

code/trunk/src/core

Files:

• CoreSettings.cc (modified) (1 diff)
• CoreSettings.h (modified) (1 diff)

code/trunk/src/core/CoreSettings.cc

@@ -49 +49 @@
     }
 
+    /**
+        @brief Sets the bool to true to avoid static functions accessing a deleted object.
+    */
+    CoreSettings::~CoreSettings()
+    {
+        isCreatingCoreSettings() = true;
+    }
+
+    /**
+        @brief Returns true if the CoreSettings instance is not yet ready and the static functions have to return a default value.
+    */
     bool& CoreSettings::isCreatingCoreSettings()
     {

code/trunk/src/core/CoreSettings.h

@@ -62 +62 @@
             CoreSettings();
             CoreSettings(const CoreSettings& other) {}
-            virtual ~CoreSettings() {}
+            virtual ~CoreSettings();
 
             int softDebugLevel_;                            //!< The debug level