From 0856197d87260e0d0adffba351831eacfcd0d354 Mon Sep 17 00:00:00 2001
From: Machiavelli <none@none>
Date: Wed, 15 Sep 2010 15:38:46 +0200
Subject: [PATCH] Core/Unit: Fix a crash in GetCurrentMovementGeneratorType().
 Author: dr.tenma Fixes issue #1876

--HG--
branch : trunk
---
 src/server/game/Movement/MotionMaster.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 618849d0ff..2aead2d4d6 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -498,14 +498,14 @@ void MotionMaster::Mutate(MovementGenerator *m, MovementSlot slot)
         i_top = slot;
     }
 
+    Impl[slot] = m;
     if (i_top > slot)
         needInit[slot] = true;
     else
     {
-        m->Initialize(*i_owner);
         needInit[slot] = false;
+        m->Initialize(*i_owner);
     }
-    Impl[slot] = m;
 }
 
 void MotionMaster::MovePath(uint32 path_id, bool repeatable)