From ba1a42ec05161d5816a8bf67855cf21ba4afc308 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Thu, 13 Nov 2014 07:41:31 +1100
Subject: [PATCH] Don't delete physics object if it was never created.

---
 apps/opencs/view/render/object.cpp | 6 ++++--
 apps/opencs/view/render/object.hpp | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 21219db8f4..e273717664 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -93,6 +93,7 @@ void CSVRender::Object::update()
             Ogre::Quaternion yr (Ogre::Radian (-reference.mPos.rot[1]), Ogre::Vector3::UNIT_Y);
             Ogre::Quaternion zr (Ogre::Radian (-reference.mPos.rot[2]), Ogre::Vector3::UNIT_Z);
 
+            mPhysicsObject = mReferenceId;
             mPhysics->addObject("meshes\\" + model, mBase->getName(), mReferenceId, reference.mScale, position, xr*yr*zr);
         }
     }
@@ -134,7 +135,7 @@ const CSMWorld::CellRef& CSVRender::Object::getReference() const
 CSVRender::Object::Object (const CSMWorld::Data& data, Ogre::SceneNode *cellNode,
     const std::string& id, bool referenceable, CSVWorld::PhysicsSystem *physics,
     bool forceBaseToZero)
-: mData (data), mBase (0), mForceBaseToZero (forceBaseToZero), mPhysics(physics)
+: mData (data), mBase (0), mForceBaseToZero (forceBaseToZero), mPhysics(physics), mPhysicsObject("")
 {
     mBase = cellNode->createChildSceneNode();
 
@@ -156,7 +157,8 @@ CSVRender::Object::~Object()
 {
     clear();
 
-    mPhysics->removeObject(mBase->getName());
+    if(mPhysicsObject != "")
+        mPhysics->removeObject(mBase->getName());
 
     if (mBase)
         mBase->getCreator()->destroySceneNode (mBase);
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index eba2dc8148..8ce204e1c7 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -32,6 +32,7 @@ namespace CSVRender
             NifOgre::ObjectScenePtr mObject;
             bool mForceBaseToZero;
             CSVWorld::PhysicsSystem *mPhysics;
+            std::string mPhysicsObject;
 
             /// Not implemented
             Object (const Object&);