From 8c9e2e0ee9e24b444efa67f811ed8be1cd87fbcb Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 23 Apr 2013 05:34:08 -0700
Subject: [PATCH] Improve handling of reaching the stop animation text key

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

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index fbf5725c46..d98a32828a 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -449,6 +449,7 @@ void Animation::doLoop(size_t layeridx)
     mLayer[layeridx].mTime = mLayer[layeridx].mLoopStartKey->first;
     mLayer[layeridx].mNextKey = mLayer[layeridx].mLoopStartKey;
     mLayer[layeridx].mNextKey++;
+    mLayer[layeridx].mPlaying = true;
     if(layeridx == 0 && mNonAccumCtrl)
         mLastPosition = mNonAccumCtrl->getTranslation(mLayer[layeridx].mTime) * mAccumulate;
 }
@@ -608,7 +609,7 @@ Ogre::Vector3 Animation::runAnimation(float duration)
             if(layeridx == 0 && mNonAccumRoot)
                 movement += updatePosition();
 
-            mLayer[layeridx].mPlaying = (mLayer[layeridx].mLooping || mLayer[layeridx].mStopKey->first > mLayer[layeridx].mTime);
+            mLayer[layeridx].mPlaying = (key != mLayer[layeridx].mStopKey);
             timepassed = targetTime - mLayer[layeridx].mTime;
 
             if(!handleTextKey(layeridx, key))