[GNUnet-SVN] r3513 - GNUnet/src/applications/fs/fsui

[grothoff]

Author: grothoff
Date: 2006-10-20 13:28:14 -0700 (Fri, 20 Oct 2006)
New Revision: 3513

Modified:
   GNUnet/src/applications/fs/fsui/downloadtest.c
   GNUnet/src/applications/fs/fsui/fsui.c
Log:
fixes

Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c      2006-10-20 20:22:12 UTC 
(rev 3512)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c      2006-10-20 20:28:14 UTC 
(rev 3513)
@@ -139,8 +139,13 @@
   case FSUI_download_completed:
 #if DEBUG_VERBOSE
     printf("Download complete.\n");
-#endif
-    break;
+#endif 
+    FSUI_abortSearch(ctx, 
+                    search);
+    FSUI_stopSearch(ctx,
+                   search);
+    search = NULL;
+   break;
   case FSUI_download_progress:
 #if DEBUG_VERBOSE
     printf("Download is progressing (%llu/%llu)...\n",
@@ -312,7 +317,7 @@
                            uri);
   CHECK(search != NULL);
   prog = 0;
-  while (lastEvent != FSUI_download_completed) {
+  while (search != NULL) {
     prog++;
     CHECK(prog < 10000);
     PTHREAD_SLEEP(50 * cronMILLIS);
@@ -364,12 +369,6 @@
     FREE(fn);
   }
   if (ctx != NULL) {
-    if (search != NULL) {
-      FSUI_abortSearch(ctx, 
-                      search);
-      FSUI_stopSearch(ctx,
-                     search);
-    }
     if (unindex != NULL)
       FSUI_stopUnindex(ctx,
                       unindex);

Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c      2006-10-20 20:22:12 UTC (rev 
3512)
+++ GNUnet/src/applications/fs/fsui/fsui.c      2006-10-20 20:28:14 UTC (rev 
3513)
@@ -559,11 +559,11 @@
   }
   MUTEX_DESTROY(ctx->lock);
   FREE(ctx->name);
-  FREE(ctx);
   if (ctx->ipc != NULL)
     GE_LOG(ectx,
           GE_INFO | GE_REQUEST | GE_USER,
           "FSUI shutdown complete.\n");
+  FREE(ctx);
 }