-fix NPE

1 files changed, 8 insertions, 8 deletions

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;
+  }
 }