From d51736d68fd46d6b0f197aaf7e1a84883f41a265 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Fri, 11 Aug 2017 05:49:33 +0300
Subject: [PATCH] [Client] Fix crashes caused by inventory items with disabling
 scripts

---
 apps/openmw/mwscript/interpretercontext.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index ea7487095..296b6eee3 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -592,7 +592,7 @@ namespace MWScript
         */
         if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen())
         {
-            if (!ref.getRefData().isEnabled())
+            if (!ref.getRefData().isEnabled() && ref.getCell() != nullptr)
             {
                 mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
                 worldEvent->reset();
@@ -620,7 +620,7 @@ namespace MWScript
         */
         if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen())
         {
-            if (ref.getRefData().isEnabled())
+            if (ref.getRefData().isEnabled() && ref.getCell() != nullptr)
             {
                 mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
                 worldEvent->reset();