diff options
| -rw-r--r-- | gpgme/ChangeLog | 6 | ||||
| -rw-r--r-- | gpgme/wait-global.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 6ee994df..d993d473 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,9 @@ +2005-04-14 Marcus Brinkmann <[email protected]> + + * 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 <[email protected]>. + 2005-03-24 Marcus Brinkmann <[email protected]> * data.h (EOPNOTSUPP) [_WIN32]: Remove definition. diff --git a/gpgme/wait-global.c b/gpgme/wait-global.c index 17e57ddb..7de72f75 100644 --- 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); |