1 files changed, 22 insertions, 3 deletions

diff --git a/src/core/main.c b/src/core/main.c
index f4185df7..977e041e 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -88,9 +88,20 @@ static int parseOptions(int argc,
   return OK;
 }
 
+static void * shutdownCode(void * arg) {
+  Semaphore * sig = arg;
+  stopCron();
+  doneGNUnetGTKCommon();
+  SEMAPHORE_UP(sig);
+  return NULL;
+}
+
 int main(int argc, 
          char *argv[]) {
   GtkWidget * root;
+  PTHREAD_T doneThread;
+  Semaphore * sig;
+  void * unused;
   
   g_thread_init(NULL);
   gtk_init(&argc, &argv);
@@ -122,10 +133,18 @@ int main(int argc,
   gtk_main();
   gdk_threads_leave();
   setCustomLogProc(NULL);
-  while (YES == gtkRunSomeSaveCalls()) ;    
-  stopCron();
 
-  doneGNUnetGTKCommon();
+  sig = SEMAPHORE_NEW(0);
+  if (0 != PTHREAD_CREATE(&doneThread,
+                          &shutdownCode,
+                          sig,
+                          64*1024))
+    DIE_STRERROR("pthread_create");
+  while (OK != SEMAPHORE_DOWN_NONBLOCKING(sig))
+    gtkRunSomeSaveCalls();
+  PTHREAD_JOIN(&doneThread,
+               &unused);
+  SEMAPHORE_FREE(sig);
   doneUtil();
   
   return 0;