Merge branch 'youonlyneedtounlockonce' into 'master'

Don't unlock unlocked objects now that unlock is no longer idempotent

See merge request OpenMW/openmw!3125

apps/openmw/mwmechanics/spelleffects.cpp

@@ -954,8 +954,8 @@ namespace MWMechanics
 
                         if (caster == getPlayer())
                             MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicOpenSuccess}");
+                        target.getCellRef().unlock();
                     }
-                    target.getCellRef().unlock();
                 }
                 else
                 {

apps/openmw/mwscript/miscextensions.cpp

@@ -366,8 +366,8 @@ namespace MWScript
             void execute(Interpreter::Runtime& runtime) override
             {
                 MWWorld::Ptr ptr = R()(runtime);
-
+                if (ptr.getCellRef().isLocked())
-                ptr.getCellRef().unlock();
+                    ptr.getCellRef().unlock();
             }
         };