fix eraseStatic() assumptions

12 years ago · 52ed451ae7
parent 83932ebfe8
commit 52ed451ae7
1 changed files with 4 additions and 1 deletions
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@ -192,11 +192,14 @@ namespace MWWorld
            if (it != mStatic.end() && Misc::StringUtils::ciEqual(it->second.mId, id)) {
                // delete from the static part of mShared
                typename std::vector<T *>::iterator sharedIter = mShared.begin();
-                for (; sharedIter != (mShared.begin()+mStatic.size()); ++sharedIter) {
+                typename std::vector<T *>::iterator end = sharedIter + mStatic.size();
+
+                while (sharedIter != mShared.end() && sharedIter != end) { 
                    if((*sharedIter)->mId == item.mId) {
                        mShared.erase(sharedIter);
                        break;
                    }
+                    ++sharedIter;
                }
                mStatic.erase(it);
            }