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/DynamicObject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp
index 72c1f4b2ce2..93a311bcbe1 100644
--- a/src/game/DynamicObject.cpp
+++ b/src/game/DynamicObject.cpp
@@ -65,8 +65,8 @@ void DynamicObject::RemoveFromWorld()
                 sLog.outCrash("DynamicObject::RemoveFromWorld cannot find viewpoint owner");
             }
         }
-        ObjectAccessor::Instance().RemoveObject(this);
         WorldObject::RemoveFromWorld();
+        ObjectAccessor::Instance().RemoveObject(this);
     }
 }
 
-- 
cgit v1.2.3