From 977f717f8bc99a17880a1551bdb525bc6f3dc1e4 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Tue, 27 Jul 2021 16:33:07 +0200
Subject: [PATCH] Prevent a missing weapon animation from partially freezing
 actors

---
 apps/openmw/mwmechanics/character.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index d5a1d46a88..8952c21daa 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1661,7 +1661,8 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
                                  MWRender::Animation::BlendMask_All, false,
                                  weapSpeed, startKey, stopKey,
                                  0.0f, 0);
-                mUpperBodyState = UpperCharState_StartToMinAttack;
+                if(mAnimation->isPlaying(mCurrentWeapon))
+                    mUpperBodyState = UpperCharState_StartToMinAttack;
             }
         }