1 files changed, 3 insertions, 2 deletions

diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index 4c41191f..3bf15dcd 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -964,11 +964,12 @@ static void
 stop_search (GtkButton * button, gpointer user_data)
 {
   struct SearchTab *tab = user_data;
+  struct GNUNET_FS_SearchContext *sc;
 
-  if (tab->sc != NULL)
+  if (NULL != (sc = tab->sc))
   {
-    GNUNET_FS_search_stop (tab->sc);
     tab->sc = NULL;
+    GNUNET_FS_search_stop (sc);
   }
 }