mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-25 16:43:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix crash when adding items to certain disabled creatures (bug #4441)

Browse Source
This commit is contained in:
David Cernat 2018-06-05 18:09:10 +03:00
parent 7605d928db
commit 04a2025340
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/openmw/mwrender/objects.cpp
View File

@ -123,11 +123,12 @@ bool Objects::removeObject (const MWWorld::Ptr& ptr)
mObjects.erase(iter); mObjects.erase(iter);
if (ptr.getClass().isNpc()) if (ptr.getClass().isActor())
{ {
MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr); if (ptr.getClass().hasInventoryStore(ptr))
store.setInvListener(NULL, ptr); ptr.getClass().getInventoryStore(ptr).setInvListener(NULL, ptr);
store.setContListener(NULL);
ptr.getClass().getContainerStore(ptr).setContListener(NULL);
} }
ptr.getRefData().getBaseNode()->getParent(0)->removeChild(ptr.getRefData().getBaseNode()); ptr.getRefData().getBaseNode()->getParent(0)->removeChild(ptr.getRefData().getBaseNode());