mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 10:53:53 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
scrawl 2012-08-12 23:01:25 +02:00
commit c4fe2e4e2a
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwbase/environment.cpp
View file

@ -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;

3
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -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()

1
libs/openengine/gui/manager.cpp
View file

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