diff options
author | Petr Mikheev <ptmikheev@gmail.com> | 2022-01-23 11:30:22 +0100 |
---|---|---|
committer | Petr Mikheev <ptmikheev@gmail.com> | 2022-01-23 11:30:22 +0100 |
commit | 24989e7bc1fb66577ec340591afa8d2e8f91d708 (patch) | |
tree | 9ebefb36e2959615e8c7e23d889382272c255489 | |
parent | c263bbf0f68aa66891efadb7d09bc2f31706f088 (diff) |
Validate that object exists before onActorActive Lua handler
-rw-r--r-- | apps/openmw/mwlua/luamanagerimp.cpp | 8 |
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()) |