mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-03 08:11:32 +00:00
Code Issues Releases Wiki Activity

Validate that object exists before onActorActive Lua handler

Browse source
This commit is contained in:
Petr Mikheev 2022-01-23 11:30:22 +01:00
parent c263bbf0f6
commit 24989e7bc1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwlua/luamanagerimp.cpp
View file

@ -200,7 +200,13 @@ namespace MWLua
} }
for (ObjectId id : mActorAddedEvents) 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(); mActorAddedEvents.clear();
if (!mWorldView.isPaused()) if (!mWorldView.isPaused())