Merge pull request #3012 from akortunov/container_crash

Fix crash on saving
4 years ago · 425fa837d1
parent e65fad2070 8e647aa72a
commit 425fa837d1
1 changed files with 7 additions and 1 deletions
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@ -308,8 +308,14 @@ namespace MWClass

    void Container::writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const
    {
+        if (!ptr.getRefData().getCustomData())
+        {
+            state.mHasCustomState = false;
+            return;
+        }
+
        const ContainerCustomData& customData = ptr.getRefData().getCustomData()->asContainerCustomData();
-        if (!ptr.getRefData().getCustomData() || !customData.mStore.isResolved())
+        if (!customData.mStore.isResolved())
        {
            state.mHasCustomState = false;
            return;