From 31a4e10c6f67bcf3041648d321994369434c5eb9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 14 Jun 2014 19:12:49 +0200
Subject: [PATCH] Fix incorrect trigger of change flag for static doors

---
 apps/openmw/mwclass/door.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 12645c9f39..0a5b774f5f 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -57,11 +57,13 @@ namespace MWClass
             physics.addObject(ptr);
 
         // Resume the door's opening/closing animation if it wasn't finished
-        ensureCustomData(ptr);
-        const DoorCustomData& customData = dynamic_cast<const DoorCustomData&>(*ptr.getRefData().getCustomData());
-        if (customData.mDoorState > 0)
+        if (ptr.getRefData().getCustomData())
         {
-            MWBase::Environment::get().getWorld()->activateDoor(ptr, customData.mDoorState == 1 ? true : false);
+            const DoorCustomData& customData = dynamic_cast<const DoorCustomData&>(*ptr.getRefData().getCustomData());
+            if (customData.mDoorState > 0)
+            {
+                MWBase::Environment::get().getWorld()->activateDoor(ptr, customData.mDoorState == 1 ? true : false);
+            }
         }
     }