From edf18a7d6ec12d9519d00e14f5a532c940a463d9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 15 Dec 2012 22:01:45 +0100
Subject: [PATCH] change destruction order to fix crash on exit when a video is
 playing

---
 apps/openmw/mwbase/environment.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index 9aaa5af85a..5a13a50ec9 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -128,12 +128,6 @@ float MWBase::Environment::getFrameDuration() const
 
 void MWBase::Environment::cleanup()
 {
-    delete mInputManager;
-    mInputManager = 0;
-
-    delete mSoundManager;
-    mSoundManager = 0;
-
     delete mMechanicsManager;
     mMechanicsManager = 0;
 
@@ -146,11 +140,17 @@ void MWBase::Environment::cleanup()
     delete mScriptManager;
     mScriptManager = 0;
 
+    delete mWorld;
+    mWorld = 0;
+
+    delete mSoundManager;
+    mSoundManager = 0;
+
     delete mWindowManager;
     mWindowManager = 0;
 
-    delete mWorld;
-    mWorld = 0;
+    delete mInputManager;
+    mInputManager = 0;
 }
 
 const MWBase::Environment& MWBase::Environment::get()