Changeset 2847 for code/branches/gui

Timestamp:

Mar 25, 2009, 7:36:23 PM (16 years ago)

Author:

rgrieder

Message:

De initialisation bugfix in GSGraphics.

File:

• code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) (4 diffs)

code/branches/gui/src/orxonox/gamestates/GSGraphics.cc

@@ -35 +35 @@
 #include "util/Debug.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
-#include "core/Core.h"
+#include "core/Game.h"
 #include "core/input/InputManager.h"
 #include "core/input/KeyBinder.h"
@@ -45 +46 @@
 #include "gui/GUIManager.h"
 #include "GraphicsManager.h"
-#include "core/Game.h"
 
 namespace orxonox
@@ -74 +74 @@
     void GSGraphics::activate()
     {
+        Core::setShowsGraphics(true);
+
         setConfigValues();
-
-        Core::setShowsGraphics(true);
 
         // initialise graphics manager. Doesn't load the render window yet!
@@ -113 +113 @@
     void GSGraphics::deactivate()
     {
-        InputManager::getInstance().requestLeaveState("master");
+        masterInputState_->setHandler(0);
+        InputManager::getInstance().requestDestroyState("master");
+        delete this->masterKeyBinder_;
 
         delete this->guiManager_;
-
         delete this->console_;
-
-        //inputManager_->getMasterInputState()->removeKeyHandler(this->masterKeyBinder_);
-        delete this->masterKeyBinder_;
-        delete this->inputManager_;
 
         Loader::unload(this->debugOverlay_);
         delete this->debugOverlay_;
 
+        delete this->inputManager_;
+        this->inputManager_ = 0;
+
         delete graphicsManager_;
-
-        masterInputState_->setHandler(0);
-        InputManager::getInstance().requestDestroyState("master");
-        if (this->masterKeyBinder_)
-        {
-            delete this->masterKeyBinder_;
-            this->masterKeyBinder_ = 0;
-        }
 
         Core::setShowsGraphics(false);