From 14d3b213a1a57af2baa31bfa3205f03c389186f5 Mon Sep 17 00:00:00 2001
From: Capostrophic <21265616+Capostrophic@users.noreply.github.com>
Date: Sun, 8 Jul 2018 23:08:57 +0300
Subject: [PATCH] Fix double call of addContainerScripts on player in
 moveObject (fixes #4490)

---
 apps/openmw/mwworld/worldimp.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 9de4da1ee..3ea364b77 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1166,7 +1166,10 @@ namespace MWWorld
             if (isPlayer)
             {
                 if (!newCell->isExterior())
+                {
                     changeToInteriorCell(Misc::StringUtils::lowerCase(newCell->getCell()->mName), pos, false);
+                    removeContainerScripts(getPlayerPtr());
+                }
                 else
                 {
                     if (mWorldScene->isCellActive(*newCell))
@@ -1187,9 +1190,8 @@ namespace MWWorld
                     mWorldScene->addObjectToScene(newPtr);
 
                     std::string script = newPtr.getClass().getScript(newPtr);
-                    if (!script.empty()) {
+                    if (!script.empty())
                         mLocalScripts.add(script, newPtr);
-                    }
                     addContainerScripts(newPtr, newCell);
                 }
                 else if (!newCellActive && currCellActive)