1 files changed, 3 insertions, 18 deletions

diff --git a/src/core/main.c b/src/core/main.c
index 977e041e..ca9919a5 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -88,20 +88,15 @@ static int parseOptions(int argc,
   return OK;
 }
 
-static void * shutdownCode(void * arg) {
-  Semaphore * sig = arg;
+static void * shutdownCode(void * unused) {
   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);
@@ -133,18 +128,8 @@ int main(int argc,
   gtk_main();
   gdk_threads_leave();
   setCustomLogProc(NULL);
-
-  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);
+  run_with_save_calls(&shutdownCode,
+                      NULL);
   doneUtil();
   
   return 0;