1 files changed, 28 insertions, 19 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 8d597df4..c150b989 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -33,6 +33,7 @@ typedef struct {
   Semaphore * sem;
   void * args;
   SimpleCallback func;
+  int destroyed;
 } SaveCall;
 
 typedef struct Plugin {
@@ -69,9 +70,27 @@ static Plugin * plugin;
 
 static gboolean saveCallWrapper(gpointer data) {
   SaveCall * call = data;
+  int i;
+
+  /* clearly, we are no longer pending,
+     so remove from psc */
+  if (call->sem != NULL) {
+    MUTEX_LOCK(&sclock);
+    for (i=0;i<pscCount;i++) {
+      if (psc[i] == call) {
+        psc[i] = psc[pscCount-1];
+        break;
+      }
+    }
+    GNUNET_ASSERT(i != pscCount);
+    GROW(psc,
+         pscCount,
+         pscCount-1);
+    MUTEX_UNLOCK(&sclock);
+  }
 
   call->func(call->args);
-  if (call->sem != NULL)
+  if (call->sem != NULL) 
     SEMAPHORE_UP(call->sem);
   return FALSE;
 }
@@ -84,7 +103,6 @@ static gboolean saveCallWrapper(gpointer data) {
 void gtkSaveCall(SimpleCallback func, 
                  void * args) {
   SaveCall call;
-  int i;
 
   MUTEX_LOCK(&sclock);
   if ( (saveCallsUp == NO) ||
@@ -92,27 +110,15 @@ void gtkSaveCall(SimpleCallback func,
     call.args = args;
     call.func = func;
     call.sem  = SEMAPHORE_NEW(0);
+    call.destroyed = 0;
     GROW(psc,
          pscCount,
          pscCount+1);
     psc[pscCount-1] = &call;
-    MUTEX_UNLOCK(&sclock);
-    gtk_idle_add(&saveCallWrapper, 
+    gtk_idle_add(&saveCallWrapper,
                  &call);
-    SEMAPHORE_DOWN(call.sem);
-    /* remove from psc list */
-    MUTEX_LOCK(&sclock);
-    for (i=0;i<pscCount;i++) {
-      if (psc[i] == &call) {
-        psc[i] = psc[pscCount-1];
-        break;
-      }
-    }
-    GNUNET_ASSERT(i != pscCount);
-    GROW(psc,
-         pscCount,
-         pscCount-1);
     MUTEX_UNLOCK(&sclock);
+    SEMAPHORE_DOWN(call.sem);
     SEMAPHORE_FREE(call.sem);
   } else {
     MUTEX_UNLOCK(&sclock);
@@ -131,8 +137,11 @@ int gtkRunSomeSaveCalls() {
     return NO;
   }
   i = randomi(pscCount);
-  if (TRUE == g_idle_remove_by_data(psc[i]->args))
-    psc[i]->func(psc[i]);
+  g_idle_remove_by_data(psc[i]->args); 
+  /* yes, ignore return value here, GTK seems
+     to be dropping these during shutdown, and
+     we still want to run them nevertheless */
+  psc[i]->func(psc[i]);
   MUTEX_UNLOCK(&sclock);
   gnunet_util_sleep(50 * cronMILLIS);
   /* sleep here is somewhat important, first of