Fix #7441: Objects that are removed and disabled in the same frame via lua remain in the world but become uninteractable

2 years ago · 39fc832fde
parent fc5d73648a
commit 39fc832fde
1 changed files with 2 additions and 0 deletions
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@ -291,6 +291,8 @@ namespace MWLua
                if (enable && object.ptr().getRefData().isDeleted())
                    throw std::runtime_error("Object is removed");
                context.mLuaManager->addAction([object, enable] {
+                    if (object.ptr().getRefData().isDeleted())
+                        return;
                    if (object.ptr().isInCell())
                    {
                        if (enable)