Merged pull request #1807

apps/openmw/mwmechanics/character.cpp

@@ -1228,6 +1228,10 @@ bool CharacterController::updateWeaponState()
         if ((!isWerewolf || mWeaponType != WeapType_Spell)
             && mUpperBodyState != UpperCharState_UnEquipingWeap
             && !isStillWeapon)
+        {
+            // We can not play un-equip animation when we switch to HtH
+            // because we already un-equipped weapon
+            if (weaptype != WeapType_HandToHand || mWeaponType == WeapType_Spell)
             {
                 // Note: we do not disable unequipping animation automatically to avoid body desync
                 getWeaponGroup(mWeaponType, weapgroup);
@@ -1235,6 +1239,7 @@ bool CharacterController::updateWeaponState()
                                 MWRender::Animation::BlendMask_All, false,
                                 1.0f, "unequip start", "unequip stop", 0.0f, 0);
                 mUpperBodyState = UpperCharState_UnEquipingWeap;
+            }
 
             if(!downSoundId.empty())
             {