2005-04-14 Marcus Brinkmann <marcus@g10code.de>

	* wait-global.c (gpgme_wait): If no context is found, and we
	should not hang, set *status to 0 and return NULL.
	Reported by Igor Belyi <gpgme@katehok.ac93.org>.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 6ee994df7dd8c6d93c762379b5709b7cce16f561..d993d47329c9e426870310365bd43aaeb7c4a87f 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-14  Marcus Brinkmann  <marcus@g10code.de>
+
+       * wait-global.c (gpgme_wait): If no context is found, and we
+       should not hang, set *status to 0 and return NULL.
+       Reported by Igor Belyi <gpgme@katehok.ac93.org>.
+
 2005-03-24  Marcus Brinkmann  <marcus@g10code.de>
 
        * data.h (EOPNOTSUPP) [_WIN32]: Remove definition.

diff --git a/gpgme/wait-global.c b/gpgme/wait-global.c
index 17e57ddb1b805b0ba4e61f507260fe24d110667f..7de72f750790396a520980cab2aba4fa92058408 100644 (file)
--- a/gpgme/wait-global.c
+++ b/gpgme/wait-global.c
@@ -350,6 +350,12 @@ gpgme_wait (gpgme_ctx_t ctx, gpgme_error_t *status, int hang)
            ctx = dctx;
            hang = 0;
          }
+       else if (!hang)
+         {
+           ctx = NULL;
+           if (status)
+             *status = NULL;
+         }
       }
     }
   while (hang);