[GNUnet-SVN] r10275 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2010-02-10 18:06:42 +0100 (Wed, 10 Feb 2010)
New Revision: 10275

Modified:
   gnunet/src/util/server.c
Log:
fixing the fix

Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c    2010-02-10 16:54:51 UTC (rev 10274)
+++ gnunet/src/util/server.c    2010-02-10 17:06:42 UTC (rev 10275)
@@ -1186,24 +1186,22 @@
         server->clients = pos->next;
       else
         prev->next = pos->next;
+      if (client->restart_task != GNUNET_SCHEDULER_NO_TASK)
+       GNUNET_SCHEDULER_cancel (server->sched,
+                                client->restart_task);
       n = server->disconnect_notify_list;
       while (n != NULL)
         {
           n->callback (n->callback_cls, client);
           n = n->next;
         }
-      if (client->restart_task != GNUNET_SCHEDULER_NO_TASK)
-       GNUNET_SCHEDULER_cancel (client->server->sched,
-                                client->restart_task);
     }
   if (rc > 0)
     return;
   if (client->in_process_client_buffer)
     return;
   client->destroy (client->client_closure);
-  GNUNET_free (client);
-
-  
+  GNUNET_free (client);  
 }