Merge branch 'lua_fix_onActorActive' into 'master'

Validate that object exists before onActorActive Lua handler

See merge request OpenMW/openmw!1580

1 files changed, 7 insertions, 1 deletions

diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 8211c37abf..459a85d9c9 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -200,7 +200,13 @@ namespace MWLua
         }
 
         for (ObjectId id : mActorAddedEvents)
-            mGlobalScripts.actorActive(GObject(id, objectRegistry));
+        {
+            GObject obj(id, objectRegistry);
+            if (obj.isValid())
+                mGlobalScripts.actorActive(obj);
+            else
+                Log(Debug::Verbose) << "Can not call onActorActive engine handler: object" << idToString(id) << " is already removed";
+        }
         mActorAddedEvents.clear();
 
         if (!mWorldView.isPaused())