Merge pull request #135 from OpenMW/master

Add OpenMW commits up to 29 Jan
8 years ago · da2f66d6ba
parent 8e1dff8e02 d97e9cfe7e
commit da2f66d6ba
1 changed files with 2 additions and 1 deletions
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@ -682,7 +682,8 @@ namespace MWScript
        if (!mReference.isEmpty() && base == mReference)
        {
            mReference = updated;
-            mLocals = &mReference.getRefData().getLocals();
+            if (mLocals == &base.getRefData().getLocals())
+                mLocals = &mReference.getRefData().getLocals();
        }
    }
 }