Don't extinguish held light sources when they're hidden (bug #6910)

CHANGELOG.md

@@ -136,6 +136,7 @@
     Bug #6898: Accessing the Quick Inventory menu does not work while in menu mode
     Bug #6901: Morrowind.exe soul gem usage discrepancy
     Bug #6909: Using enchanted items has no animation
+    Bug #6910: Torches should not be extinguished when not being held
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"

apps/openmw/mwmechanics/actors.cpp

@@ -988,15 +988,12 @@ namespace MWMechanics
         heldIter = inventoryStore.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
 
         //If holding a light...
-        if(heldIter.getType() == MWWorld::ContainerStore::Type_Light)
-        {
         const auto world = MWBase::Environment::get().getWorld();
+        MWRender::Animation *anim = world->getAnimation(ptr);
+        if (heldIter.getType() == MWWorld::ContainerStore::Type_Light && anim && anim->getCarriedLeftShown())
+        {
             // Use time from the player's light
             if(isPlayer)
-            {
-                // But avoid using it up if the light source is hidden
-                MWRender::Animation *anim = world->getAnimation(ptr);
-                if (anim && anim->getCarriedLeftShown())
             {
                 float timeRemaining = heldIter->getClass().getRemainingUsageTime(*heldIter);
 
@@ -1013,7 +1010,6 @@ namespace MWMechanics
                     heldIter->getClass().setRemainingUsageTime(*heldIter, timeRemaining);
                 }
             }
-            }
 
             // Both NPC and player lights extinguish in water.
             if(world->isSwimming(ptr))