Changeset 1762 for code/trunk

Timestamp:

Sep 10, 2008, 12:01:46 PM (16 years ago)

Author:

rgrieder

Message:

Fix for Core::getInstance didn't work on linux.

File:

• code/trunk/src/core/Core.cc (modified) (3 diffs)

code/trunk/src/core/Core.cc

@@ -50 +50 @@
         RegisterRootObject(Core);
         this->setConfigValues();
+        isCreatingCoreSettings() = false;
     }
 
@@ -66 +67 @@
     {
         static bool bCreatingCoreSettings = true;
-        static bool bFirstTime = true;
-        if (bFirstTime)
-        {
-            bFirstTime = false;
-            Core::getInstance();
-        }
         return bCreatingCoreSettings;
     }
@@ -81 +76 @@
     Core& Core::getInstance()
     {
-        static Core instance;
-
         // If bCreatingSoftDebugLevelObject is true, we're just about to create an instance of the DebugLevel class
         //if (Core::isCreatingCoreSettings())
         //{
         //    isCreatingCoreSettings() = false;
-        //    instance.setConfigValues();
+        //    //instance.setConfigValues();
         //}
+
+        static bool firstTime = true;
+        if (firstTime)
+            isCreatingCoreSettings() = true;
+
+        static Core instance;
         return instance;
     }