fixing Mantis 1194 and potential crash

2 files changed, 5 insertions, 1 deletions

diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h
index acd24776..0cba8086 100644
--- a/src/plugins/fs/fs.h
+++ b/src/plugins/fs/fs.h
@@ -294,6 +294,8 @@ typedef struct UL {
 
   int has_terminated;
 
+  int is_top;
+
 } UploadList;
 
 extern struct FSUI_Context * ctx;
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 971c1bb9..5749ae7c 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -150,6 +150,7 @@ fs_upload_started(struct FSUI_UploadList * fsui,
   ret->filename = STRDUP(filename);
   ret->fsui_list = fsui;
   ret->total = total;
+  ret->is_top = parent == NULL;
   if ( (parent != NULL) &&
        (NULL != (path = gtk_tree_row_reference_get_path(parent->summaryViewRowReference))) ) {
     gtk_tree_model_get_iter(GTK_TREE_MODEL(upload_summary),
@@ -558,7 +559,8 @@ clearCompletedUploadCallback(GtkTreeModel * model,
                      iter,
                      UPLOAD_INTERNAL, &ul,
                      -1);
-  if (ul->has_terminated) {
+  if ( (ul->has_terminated) &&
+       (ul->is_top) ) {
     fcbc.method = &FSUI_stopUpload;
     fcbc.argument = ul->fsui_list;
     run_with_save_calls(&fsui_callback,