forked from mirror/openmw-tes3mp
fix WindowManager destruction
This commit is contained in:
parent
c4bf6214db
commit
97c45455fd
3 changed files with 4 additions and 3 deletions
|
@ -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;
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -36,6 +36,7 @@ void MyGUIManager::setup(Ogre::RenderWindow *wnd, Ogre::SceneManager *mgr, bool
|
|||
|
||||
void MyGUIManager::shutdown()
|
||||
{
|
||||
mGui->shutdown ();
|
||||
delete mGui;
|
||||
if(mPlatform)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue