--- deliantra/server/socket/init.C	2006/12/25 11:25:50	1.31
+++ deliantra/server/socket/init.C	2007/01/06 14:42:31	1.33
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2001 Mark Wedel
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -164,6 +165,10 @@
 
 client::~client ()
 {
+  sockvec::iterator i = find (clients.begin (), clients.end (), this);
+  if (i != clients.end ())
+    clients.erase (i);
+
   sfree<uint8> (faces_sent, nrofpixmaps);
   free (stats.range);
   free (stats.title);
@@ -175,10 +180,6 @@
 {
   attachable::do_destroy ();
 
-  sockvec::iterator i = find (clients.begin (), clients.end (), this);
-  if (i != clients.end ())
-    clients.erase (i);
-
   if (pl)
     pl->disconnect ();