Validate that object exists before onActorActive Lua handler

3 years ago · 24989e7bc1
parent c263bbf0f6
commit 24989e7bc1
1 changed files with 7 additions and 1 deletions
--- 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())