fixing #3799: only unindex if DB operations succeeded previously in the first place, and when unindexing do proper shutdown handling

1 files changed, 18 insertions, 6 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 4d5ea6a3..bfb8645a 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -4047,18 +4047,30 @@ GNUNET_GTK_fs_event_handler (void *cls,
     GNUNET_FS_GTK_unindex_handle_stop_ (info->value.unindex.cctx);
     return NULL;
   case GNUNET_FS_STATUS_UNINDEX_PROGRESS:
-    GNUNET_FS_GTK_unindex_handle_progress_ (info->value.unindex.cctx,
-                                            info->value.unindex.completed);
+    /* info->value.unindex.cctx is NULL if the unindexing was
+       triggered by a *failed* publishing operation; in this case
+       we don't do anything in the GUI but just clean up when
+       the operation is complete (or fails) */
+    if (NULL != info->value.unindex.cctx)
+      GNUNET_FS_GTK_unindex_handle_progress_ (info->value.unindex.cctx,
+                                              info->value.unindex.completed);
     return info->value.unindex.cctx;
   case GNUNET_FS_STATUS_UNINDEX_ERROR:
-    GNUNET_FS_GTK_unindex_handle_error_ (info->value.unindex.cctx,
-                                         info->value.unindex.specifics.error.message);
+    if (NULL != info->value.unindex.cctx)
+      GNUNET_FS_GTK_unindex_handle_error_ (info->value.unindex.cctx,
+                                           info->value.unindex.specifics.error.message);
+    else
+      GNUNET_FS_unindex_stop (info->value.unindex.uc);
     return info->value.unindex.cctx;
   case GNUNET_FS_STATUS_UNINDEX_COMPLETED:
-    GNUNET_FS_GTK_unindex_handle_completed_ (info->value.unindex.cctx);
+    if (NULL != info->value.unindex.cctx)
+      GNUNET_FS_GTK_unindex_handle_completed_ (info->value.unindex.cctx);
+    else
+      GNUNET_FS_unindex_stop (info->value.unindex.uc);
     return info->value.unindex.cctx;
   case GNUNET_FS_STATUS_UNINDEX_STOPPED:
-    GNUNET_FS_GTK_unindex_handle_stop_ (info->value.unindex.cctx);
+    if (NULL != info->value.unindex.cctx)
+      GNUNET_FS_GTK_unindex_handle_stop_ (info->value.unindex.cctx);
     return NULL;
   default:
     GNUNET_break (0);