1 files changed, 2 insertions, 3 deletions
diff --git a/src/assuan-pipe-connect.c b/src/assuan-pipe-connect.c
index 1ca6948..5b952b2 100644
--- a/src/assuan-pipe-connect.c
+++ b/src/assuan-pipe-connect.c
@@ -119,9 +119,8 @@ do_finish (assuan_context_t ctx)
   if (ctx->pid != -1 && ctx->pid)
     {
 #ifndef HAVE_W32_SYSTEM
-      /* FIXME: Does it really make sense to use the waitpid?  What
-         about using a double fork and forget abnout it. */
-      waitpid (ctx->pid, NULL, 0);  /* FIXME Check return value.  */
+      if (!ctx->flags.no_waitpid)
+        waitpid (ctx->pid, NULL, 0); 
       ctx->pid = -1;
 #endif /*!HAVE_W32_SYSTEM*/
     }