1 files changed, 9 insertions, 7 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index ebe9fd41..8c30c777 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -464,21 +464,23 @@ static void * shutdownCode(void * arg) {
 
 void run_with_save_calls(PThreadMain cb,
                          void * arg) {
- PTHREAD_T doneThread;
- Semaphore * sig;
- void * unused;
+  PTHREAD_T doneThread;
+  void * unused;
+  struct rwsc_closure cls;
  
-  sig = SEMAPHORE_NEW(0);
+  cls.sig = SEMAPHORE_NEW(0);
+  cls.realMain = cb;
+  cls.arg = arg;
   if (0 != PTHREAD_CREATE(&doneThread,
                           &shutdownCode,
-                          sig,
+                          &cls,
                           64*1024))
     DIE_STRERROR("pthread_create");
-  while (OK != SEMAPHORE_DOWN_NONBLOCKING(sig))
+  while (OK != SEMAPHORE_DOWN_NONBLOCKING(cls.sig))
     gtkRunSomeSaveCalls();
   PTHREAD_JOIN(&doneThread,
                &unused);
-  SEMAPHORE_FREE(sig);
+  SEMAPHORE_FREE(cls.sig);
 }
 
 /* end of helper.c */