From a3ff9e5be870aa8f91c5357003979b223812dd88 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 26 Dec 2013 15:57:54 +0100
Subject: [PATCH] Change destruction order - fixes a shutdown crash discovered
 with mesa

---
 apps/opencs/main.cpp              |  4 ++--
 libs/openengine/ogre/renderer.cpp | 11 ++++++++++-
 libs/openengine/ogre/renderer.hpp |  9 ++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp
index 341bdc780..57eaf2d25 100644
--- a/apps/opencs/main.cpp
+++ b/apps/opencs/main.cpp
@@ -42,10 +42,10 @@ int main(int argc, char *argv[])
 
     // TODO: Ogre startup shouldn't be here, but it currently has to:
     // SceneWidget destructor will delete the created render window, which would be called _after_ Root has shut down :(
-    OgreInit::OgreInit ogreInit;
-    ogreInit.init("./opencsOgre.log"); // TODO log path?
 
     Application mApplication (argc, argv);
+    OgreInit::OgreInit ogreInit;
+    ogreInit.init("./opencsOgre.log"); // TODO log path?
 
 #ifdef Q_OS_MAC
     QDir dir(QCoreApplication::applicationDirPath());
diff --git a/libs/openengine/ogre/renderer.cpp b/libs/openengine/ogre/renderer.cpp
index a0fe6ca84..07bc8f3c9 100644
--- a/libs/openengine/ogre/renderer.cpp
+++ b/libs/openengine/ogre/renderer.cpp
@@ -11,6 +11,8 @@
 
 #include <extern/sdl4ogre/sdlwindowhelper.hpp>
 
+#include <components/ogreinit/ogreinit.hpp>
+
 #include <cassert>
 #include <stdexcept>
 
@@ -23,6 +25,12 @@ void OgreRenderer::cleanup()
     delete mFader;
     mFader = NULL;
 
+    Ogre::Root::getSingleton().destroyRenderTarget(mWindow);
+    mWindow = NULL;
+
+    delete mOgreInit;
+    mOgreInit = NULL;
+
     // If we don't do this, the desktop resolution is not restored on exit
     SDL_SetWindowFullscreen(mSDLWindow, 0);
 
@@ -50,7 +58,8 @@ void OgreRenderer::configure(const std::string &logPath,
                              const std::string& rttMode
                             )
 {
-    mRoot = mOgreInit.init(logPath + "/ogre.log");
+    mOgreInit = new OgreInit::OgreInit();
+    mRoot = mOgreInit->init(logPath + "/ogre.log");
 
     RenderSystem* rs = mRoot->getRenderSystemByName(renderSystem);
     if (rs == 0)
diff --git a/libs/openengine/ogre/renderer.hpp b/libs/openengine/ogre/renderer.hpp
index e4af0bf77..f45f09b01 100644
--- a/libs/openengine/ogre/renderer.hpp
+++ b/libs/openengine/ogre/renderer.hpp
@@ -9,8 +9,6 @@
 
 #include <OgreTexture.h>
 
-#include <components/ogreinit/ogreinit.hpp>
-
 
 struct SDL_Window;
 struct SDL_Surface;
@@ -26,6 +24,11 @@ namespace Ogre
     class ParticleAffectorFactory;
 }
 
+namespace OgreInit
+{
+    class OgreInit;
+}
+
 namespace OEngine
 {
     namespace Render
@@ -57,7 +60,7 @@ namespace OEngine
             Ogre::Camera *mCamera;
             Ogre::Viewport *mView;
 
-            OgreInit::OgreInit mOgreInit;
+            OgreInit::OgreInit* mOgreInit;
 
             Fader* mFader;