1 files changed, 9 insertions, 0 deletions

diff --git a/src/fs/gnunet-fs-gtk-main_window_file_publish.c b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
index ee74ec64..cd18da87 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -944,7 +944,11 @@ add_dir_callback (void *cls, struct GNUNET_DISK_DirectoryIterator * di,
   if (dirname == NULL)
   {
     if (di == NULL)
+    {
+      /* This is the top-level entry, hook the treemodel back */
+      gtk_tree_view_set_model (adc->ctx->file_info_treeview, adc->ctx->file_info_treemodel);
       return;
+    }
     else
       will_continue = GNUNET_DISK_directory_iterator_next (di, GNUNET_NO);
   }
@@ -1031,6 +1035,11 @@ add_dir (struct MainPublishingDialogContext *ctx, const char *filename,
   scan_ctx->do_index = do_index;
   scan_ctx->ctx = ctx;
 
+  /* Disconnect treestore from the treeview to prevent GTK from trying
+   * to update it on the fly.
+   */
+  gtk_tree_view_set_model (ctx->file_info_treeview, NULL);
+
   /* just make sure that dirname is not NULL, it's not really used */
   add_dir_callback (scan_ctx, NULL, filename_expanded, filename_expanded);
   GNUNET_free (filename_expanded);