fix WindowManager destruction

actorid
scrawl 13 years ago
parent c4bf6214db
commit 97c45455fd

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

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

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

Loading…
Cancel
Save