-fix NPE

2 files changed, 9 insertions, 9 deletions

diff --git a/contrib/gnunet_identity_gtk_about_window.glade b/contrib/gnunet_identity_gtk_about_window.glade
index 097e8709..a75a926a 100644
--- a/contrib/gnunet_identity_gtk_about_window.glade
+++ b/contrib/gnunet_identity_gtk_about_window.glade
@@ -91,7 +91,7 @@ Daniel Nylander &lt;po@danielnylander.se&gt;</property>
           <object class="GtkLabel" id="about_name_version_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label">GNUnet-Peerinfo-GTK 0.9.3</property>
+            <property name="label">GNUnet-Peerinfo-GTK 0.9.5</property>
             <attributes>
               <attribute name="weight" value="bold"/>
               <attribute name="size" value="200"/>
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index 4483b0c2..e54d0972 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -2540,14 +2540,6 @@ cleanup_task (void *cls,
     GNUNET_free (moc->data);
     GNUNET_free (moc);
   }
-  if (NULL != n2r)
-  {
-    GNUNET_CONTAINER_multihashmap_iterate (n2r,
-                                           &release_ri,
-                                           NULL);
-    GNUNET_CONTAINER_multihashmap_destroy (n2r);
-    n2r = NULL;
-  }
   gtk_tree_store_clear (ts);
   if (NULL != namestore)
   {
@@ -2569,6 +2561,14 @@ cleanup_task (void *cls,
     GNUNET_IDENTITY_disconnect (identity);
     identity = NULL;
   }
+  if (NULL != n2r)
+  {
+    GNUNET_CONTAINER_multihashmap_iterate (n2r,
+                                           &release_ri,
+                                           NULL);
+    GNUNET_CONTAINER_multihashmap_destroy (n2r);
+    n2r = NULL;
+  }
 }