2 files changed, 3 insertions, 5 deletions

diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 4e281f4c..d33ec272 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -3713,7 +3713,6 @@ Press ENTER to add the data.</atkproperty>
                       <property name="focus_on_click">True</property>
                       <signal name="clicked" handler="on_closeSearchButton_clicked" object="searchPageScrolledWindow" last_modification_time="Thu, 26 May 2005 22:42:37 GMT"/>
                       <signal name="activate" handler="on_closeSearchButton_clicked" object="searchPageScrolledWindow" last_modification_time="Fri, 27 May 2005 13:14:33 GMT"/>
-                      <accelerator key="Escape" modifiers="0" signal="activate"/>
                     </widget>
                     <packing>
                       <property name="padding">0</property>
@@ -5135,7 +5134,6 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
       <property name="label" translatable="yes">_Close</property>
       <property name="use_underline">True</property>
       <signal name="activate" handler="on_close_selected_search_activate" last_modification_time="Tue, 14 Jun 2005 23:59:56 GMT"/>
-      <accelerator key="C" modifiers="0" signal="activate"/>
 
       <child internal-child="image">
         <widget class="GtkImage" id="image18">
diff --git a/src/common/helper.c b/src/common/helper.c
index 39594109..d1a91de9 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -476,8 +476,7 @@ void run_with_save_calls(PThreadMain cb,
                           &cls,
                           64*1024))
     DIE_STRERROR("pthread_create");
-  if ( (! PTHREAD_SELF_TEST(&mainThread)) ||
-       (pscCount == 0) ) {
+  if (! PTHREAD_SELF_TEST(&mainThread)) {
     /* another thread will run the save calls */
     SEMAPHORE_DOWN(cls.sig);
   } else {
@@ -489,7 +488,8 @@ void run_with_save_calls(PThreadMain cb,
           saveCallWrapper(psc[i]);
       }
       MUTEX_UNLOCK(&sclock);
-      gnunet_util_sleep(50 * cronMILLIS);
+      if (OK != SEMAPHORE_DOWN_NONBLOCKING(cls.sig))
+        gnunet_util_sleep(50 * cronMILLIS);
     }
   }
   PTHREAD_JOIN(&doneThread,