[GNUnet-SVN] r24374 - gnunet-gtk/src/peerinfo

[gnunet]

Author: grothoff
Date: 2012-10-17 20:01:40 +0200 (Wed, 17 Oct 2012)
New Revision: 24374

Modified:
   gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
Log:
-cleaner shutdown

Modified: gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
===================================================================
--- gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c       2012-10-17 17:39:07 UTC 
(rev 24373)
+++ gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c       2012-10-17 18:01:40 UTC 
(rev 24374)
@@ -213,8 +213,11 @@
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_PEERINFO_notify_cancel (pnc);
-  pnc = NULL;
+  if (NULL != pnc)
+  {
+    GNUNET_PEERINFO_notify_cancel (pnc);
+    pnc = NULL;
+  }
   if (NULL != ats)
   {
     GNUNET_ATS_performance_done (ats);
@@ -491,7 +494,8 @@
   {
     fprintf (stderr,
              _("Failed to initialize communication with peerinfo service!\n"));
-    exit (1);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
   }
   ats = GNUNET_ATS_performance_init (get_configuration (), &status_cb, NULL);
   /* setup main window */