Changeset 1756 for code/trunk

Timestamp:

Sep 10, 2008, 2:11:01 AM (16 years ago)

Author:

rgrieder

Message:

Fixed a bug in Core.cc when creating it via getInstance directly for the first time.

Location:

code/trunk/src/core

Files:

• Core.cc (modified) (3 diffs)
• RootGameState.cc (modified) (1 diff)

code/trunk/src/core/Core.cc

@@ -33 +33 @@
 
 #include "Core.h"
+#include <cassert>
 #include "Language.h"
 #include "CoreIncludes.h"
@@ -80 +81 @@
     Core& Core::getInstance()
     {
-        static Core instance = Core();
+        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();
-        }
+        //if (Core::isCreatingCoreSettings())
+        //{
+        //    isCreatingCoreSettings() = false;
+        //    instance.setConfigValues();
+        //}
         return instance;
     }
@@ -138 +139 @@
         if (!Core::isCreatingCoreSettings())
         {
-            if (device == OutputHandler::LD_All)
+            switch (device)
+            {
+            case OutputHandler::LD_All:
                 return Core::getInstance().softDebugLevel_;
-            else if (device == OutputHandler::LD_Console)
+            case OutputHandler::LD_Console:
                 return Core::getInstance().softDebugLevelConsole_;
-            else if (device == OutputHandler::LD_Logfile)
+            case OutputHandler::LD_Logfile:
                 return Core::getInstance().softDebugLevelLogfile_;
-            else if (device == OutputHandler::LD_Shell)
+            case OutputHandler::LD_Shell:
                 return Core::getInstance().softDebugLevelShell_;
+            default:
+                assert(0);
+            }
         }
 

code/trunk/src/core/RootGameState.cc

@@ -134 +134 @@
         // start global orxonox time
         Clock clock;
+
+        // create the Core settings to configure the output level
+        Core::getInstance();
 
         parseArguments(argc, argv);