Make enable/disable a no-op for items in containers

11 years ago · e597328b6b
parent 8824af30b4
commit e597328b6b
1 changed files with 8 additions and 0 deletions
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@ -610,6 +610,10 @@ namespace MWWorld

    void World::enable (const Ptr& reference)
    {
+        // enable is a no-op for items in containers
+        if (!reference.isInCell())
+            return;
+
        if (!reference.getRefData().isEnabled())
        {
            reference.getRefData().enable();
@ -640,6 +644,10 @@ namespace MWWorld

    void World::disable (const Ptr& reference)
    {
+        // disable is a no-op for items in containers
+        if (!reference.isInCell())
+            return;
+
        if (reference.getRefData().isEnabled())
        {
            reference.getRefData().disable();