From 9acd4061ccc2ff497cca8e18baa4052beb073da3 Mon Sep 17 00:00:00 2001
From: k1ll <karl.glatzer@gmx.de>
Date: Sat, 2 Mar 2013 17:04:17 +0100
Subject: [PATCH] Fix dangling static references in mShared

---
 apps/openmw/mwworld/store.hpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 5fad63ff52..52120ed0ec 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -187,6 +187,15 @@ namespace MWWorld
             T item;
             item.mId = Misc::StringUtils::lowerCase(id);
 
+            // delete from static part of shared
+            typename std::vector<T *>::iterator sharedit = mShared.begin();
+            for (; sharedit != (mShared.begin()+mStatic.size()); ++sharedit) {
+                if((*sharedit)->mId == item.mId) {
+                    mShared.erase(sharedit);
+                    break;
+                }
+            }
+
             typename std::map<std::string, T>::iterator it = mStatic.find(item.mId);
 
             if (it != mStatic.end() && Misc::StringUtils::ciEqual(it->second.mId, id)) {