From eb894f39e8e05cfe2f266107da4410d19558ff80 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 28 Mar 2009 16:04:37 -0600
Subject: *First remove object from world then unregister it. This may fix some
 crashes.

--HG--
branch : trunk
---
 src/game/GameObject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/game/GameObject.cpp')

diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index f75122d888f..eb0dd10b7d4 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -93,8 +93,8 @@ void GameObject::RemoveFromWorld()
     ///- Remove the gameobject from the accessor
     if(IsInWorld())
     {
-        ObjectAccessor::Instance().RemoveObject(this);
         WorldObject::RemoveFromWorld();
+        ObjectAccessor::Instance().RemoveObject(this);
     }
 }
 
-- 
cgit v1.2.3