From b358cf24230e4438767aaae23fc914921a29ab25 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 10 May 2014 18:14:35 +0200
Subject: [PATCH] Fix a potential crash when loading script locals from
 savegame

---
 apps/openmw/mwworld/livecellref.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp
index f312c2159..4a610b45c 100644
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@@ -20,10 +20,15 @@ void MWWorld::LiveCellRefBase::loadImp (const ESM::ObjectState& state)
     if (state.mHasLocals)
     {
         std::string scriptId = mClass->getScript (ptr);
-
-        mData.setLocals (*MWBase::Environment::get().getWorld()->getStore().
-            get<ESM::Script>().find (scriptId));
-        mData.getLocals().read (state.mLocals, scriptId);
+        // Make sure we still have a script. It could have been coming from a content file that is no longer active.
+        if (!scriptId.empty())
+        {
+            if (const ESM::Script* script = MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().search (scriptId))
+            {
+                mData.setLocals (*script);
+                mData.getLocals().read (state.mLocals, scriptId);
+            }
+        }
     }
 
     mClass->readAdditionalState (ptr, state);