From 39fc832fde03b32bf333b7a337fcc5be7c62b7a8 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Wed, 28 Jun 2023 21:43:30 +0200
Subject: [PATCH] Fix #7441: Objects that are removed and disabled in the same
 frame via lua remain in the world but become uninteractable

---
 apps/openmw/mwlua/objectbindings.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp
index 02c369d023..1ebc0702b1 100644
--- 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)