Added check before removing water collision object from world

8 years ago · 7c2a088b34
parent e30dfb13d3
commit 7c2a088b34
1 changed files with 4 additions and 1 deletions
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@ -1463,7 +1463,10 @@ namespace MWPhysics
    {
        if (mWaterCollisionObject.get())
        {
-            mCollisionWorld->removeCollisionObject(mWaterCollisionObject.get());
+            if (mWaterCollisionObject.get()->getWorldArrayIndex() >= 0)
+            {
+                mCollisionWorld->removeCollisionObject(mWaterCollisionObject.get());
+            }
        }

        if (!mWaterEnabled)