From 87ce2110dcc912394a6d49599a7bb7558bac68a0 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 19 Apr 2013 14:41:26 +0200
Subject: [PATCH] hotfix for CharacterPreview destructor

---
 apps/openmw/mwrender/characterpreview.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 8396acaea8..41770d4891 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -21,13 +21,15 @@ namespace MWRender
 
     CharacterPreview::CharacterPreview(MWWorld::Ptr character, int sizeX, int sizeY, const std::string& name,
                                        Ogre::Vector3 position, Ogre::Vector3 lookAt)
-        : mSizeX(sizeX)
-        , mSizeY(sizeY)
-        , mName(name)
+
+        : mSceneMgr (0)
         , mPosition(position)
         , mLookAt(lookAt)
         , mCharacter(character)
         , mAnimation(NULL)
+        , mName(name)
+        , mSizeX(sizeX)
+        , mSizeY(sizeY)
     {
 
     }
@@ -88,16 +90,20 @@ namespace MWRender
 
     CharacterPreview::~CharacterPreview ()
     {
-        //Ogre::TextureManager::getSingleton().remove(mName);
-        mSceneMgr->destroyCamera (mName);
-        delete mAnimation;
-        Ogre::Root::getSingleton().destroySceneManager(mSceneMgr);
+        if (mSceneMgr)
+        {
+            //Ogre::TextureManager::getSingleton().remove(mName);
+            mSceneMgr->destroyAllCameras();
+            delete mAnimation;
+            Ogre::Root::getSingleton().destroySceneManager(mSceneMgr);
+        }
     }
 
     void CharacterPreview::rebuild()
     {
         assert(mAnimation);
         delete mAnimation;
+        mAnimation = 0;
 
         mAnimation = new NpcAnimation(mCharacter, mNode, MWWorld::Class::get(mCharacter).getInventoryStore(mCharacter),
                                       0, (renderHeadOnly() ? NpcAnimation::VM_HeadOnly : NpcAnimation::VM_Normal));