LRN: Don't wait for parent control handler to quit

CG: Note: this should not stand; temporary hack.

2 files changed, 6 insertions, 2 deletions

diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index d214372d7..c9458212e 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -51,7 +51,7 @@ static struct GNUNET_OS_Process current_process;
  * @param cls the 'struct GNUNET_DISK_FileHandle' of the control pipe
  * @param tc scheduler context
  */
-static void
+void
 parent_control_handler (void *cls,
                         const struct
                         GNUNET_SCHEDULER_TaskContext * tc)
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 1e9290adf..eaf965894 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -751,7 +751,11 @@ GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_Task task, void *task_cls)
 #endif
   last_tr = 0;
   busy_wait_warning = 0;
-  while ((pending != NULL) ||
+  while ((pending != NULL
+#if ENABLE_WINDOWS_WORKAROUNDS
+          && (pending->callback != parent_control_handler || pending->next != NULL)
+#endif
+         ) ||
          (pending_timeout != NULL) ||
          (ready_count > 0))
     {