[Orxonox-commit 1451] r6169 - code/branches/presentation2/src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-11-26 23:27:37 +0100 (Thu, 26 Nov 2009)
New Revision: 6169

Modified:
   code/branches/presentation2/src/libraries/core/Core.cc
   code/branches/presentation2/src/libraries/core/Game.cc
Log:
Fixed config value not setting problem in Core and Game.

Modified: code/branches/presentation2/src/libraries/core/Core.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/Core.cc	2009-11-26 19:10:52 UTC (rev 6168)
+++ code/branches/presentation2/src/libraries/core/Core.cc	2009-11-26 22:27:37 UTC (rev 6169)
@@ -145,8 +145,6 @@
         // Do this soon after the ConfigFileManager has been created to open up the
         // possibility to configure everything below here
         ClassIdentifier<Core>::getIdentifier("Core")->initialiseObject(this, "Core", true);
-        // Remove us from the object lists again to avoid problems when destroying the Core
-        this->unregisterObject();
         this->setConfigValues();
 
         // create persistent io console
@@ -172,6 +170,8 @@
     */
     Core::~Core()
     {
+        // Remove us from the object lists again to avoid problems when destroying them
+        this->unregisterObject();
     }
 
     //! Function to collect the SetConfigValue-macro calls.

Modified: code/branches/presentation2/src/libraries/core/Game.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/Game.cc	2009-11-26 19:10:52 UTC (rev 6168)
+++ code/branches/presentation2/src/libraries/core/Game.cc	2009-11-26 22:27:37 UTC (rev 6169)
@@ -111,8 +111,6 @@
 
         // Do this after the Core creation!
         ClassIdentifier<Game>::getIdentifier("Game")->initialiseObject(this, "Game", true);
-        // Remove us from the object lists again to avoid problems when destroying the Game
-        this->unregisterObject();
         this->setConfigValues();
 
         // After the core has been created, we can safely instantiate the GameStates that don't require graphics
@@ -136,6 +134,8 @@
     */
     Game::~Game()
     {
+        // Remove us from the object lists again to avoid problems when destroying them
+        this->unregisterObject();
     }
 
     void Game::setConfigValues()