Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem

apps/openmw/mwbase/environment.cpp

@@ -146,8 +146,7 @@ void MWBase::Environment::cleanup()
     delete mScriptManager;
     mScriptManager = 0;
 
-/// \todo Re-enable (currently throwing an exception)
-//    delete mWindowManager;
+    delete mWindowManager;
     mWindowManager = 0;
 
     delete mWorld;

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -159,7 +159,6 @@ WindowManager::WindowManager(
 
 WindowManager::~WindowManager()
 {
-    delete mGuiManager;
     delete mConsole;
     delete mMessageBoxManager;
     delete mHud;
@@ -182,6 +181,8 @@ WindowManager::~WindowManager()
     delete mSpellWindow;
 
     cleanupGarbage();
+
+    delete mGuiManager;
 }
 
 void WindowManager::cleanupGarbage()

libs/openengine/gui/manager.cpp

@@ -36,6 +36,7 @@ void MyGUIManager::setup(Ogre::RenderWindow *wnd, Ogre::SceneManager *mgr, bool
 
 void MyGUIManager::shutdown()
 {
+    mGui->shutdown ();
   delete mGui;
   if(mPlatform)
     {