From afbd5162ee947c893284c0cec1b1f19ed23a65bd Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 14 Jun 2014 20:02:49 +0200
Subject: [PATCH] Move AiWander arrival check to time-critical section

---
 apps/openmw/mwmechanics/aiwander.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 6a68397fd..79151e896 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -153,6 +153,17 @@ namespace MWMechanics
             }
         }
 
+        // Are we there yet?
+        if(mWalking &&
+           mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], pos.pos[2]))
+        {
+            stopWalking(actor);
+            mMoveNow = false;
+            mWalking = false;
+            mChooseAction = true;
+            mHasReturnPosition = false;
+        }
+
         if(mWalking) // have not yet reached the destination
         {
             // turn towards the next point in mPath
@@ -524,17 +535,6 @@ namespace MWMechanics
             }
         }
 
-        // Are we there yet?
-        if(mWalking &&
-           mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], pos.pos[2]))
-        {
-            stopWalking(actor);
-            mMoveNow = false;
-            mWalking = false;
-            mChooseAction = true;
-            mHasReturnPosition = false;
-        }
-
         return false; // AiWander package not yet completed
     }