1 files changed, 5 insertions, 8 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index b4f6e592..50d3195b 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -496,19 +496,16 @@ main_window_search_button_clicked_cb (GtkButton *button, gpointer user_data)
   {
     namespace_model = gtk_tree_row_reference_get_model (ref);
     namespace_treepath = gtk_tree_row_reference_get_path (ref);
-    gtk_tree_model_get_iter (namespace_model, &iter, namespace_treepath);
+    if ( (NULL != namespace_treepath) &&
+         (TRUE == gtk_tree_model_get_iter (namespace_model, &iter, namespace_treepath)) )
+      gtk_tree_model_get (namespace_model, &iter, 1, &nsid, 2, &root, -1);
   }
-
   query_entry = GTK_ENTRY (gtk_builder_get_object (builder,
-      "main_window_search_entry"));
-
-  if (namespace_treepath != NULL)
-    gtk_tree_model_get (namespace_model, &iter, 1, &nsid, 2, &root, -1);
+                                                   "main_window_search_entry"));
   if (root == NULL)
     root = g_strdup ("");
-
   entry_keywords = gtk_entry_get_text (query_entry);
-
+  /* FIXME: why is 'root' added here? Why is 'mime_keyword' not made mandatory? (+) */
   keywords = g_strdup_printf ("%s %s %s", entry_keywords, mime_keyword, root);
   g_free (mime_keyword);
   g_free (root);