diff options
Diffstat (limited to '')
| -rw-r--r-- | gpgme/gpgme.c | 2 | ||||
| -rw-r--r-- | gpgme/w32-io.c | 2 | ||||
| -rw-r--r-- | gpgme/wait.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/gpgme/gpgme.c b/gpgme/gpgme.c index 935e8e80..43e89ad2 100644 --- a/gpgme/gpgme.c +++ b/gpgme/gpgme.c @@ -113,6 +113,8 @@ _gpgme_release_result ( GpgmeCtx c ) void gpgme_cancel (GpgmeCtx c) { + return_if_fail (c); + c->cancel = 1; } diff --git a/gpgme/w32-io.c b/gpgme/w32-io.c index 8c19d818..2ee10bbb 100644 --- a/gpgme/w32-io.c +++ b/gpgme/w32-io.c @@ -638,7 +638,7 @@ _gpgme_io_select ( struct io_select_fd_s *fds, size_t nfds ) count++; } } - code = WaitForMultipleObjects ( nwait, waitbuf, 0, any_write? 0:1000); + code = WaitForMultipleObjects ( nwait, waitbuf, 0, any_write? 200:1000); if ( code >= WAIT_OBJECT_0 && code < WAIT_OBJECT_0 + nwait ) { /* This WFMO is a really silly function: It does return either * the index of the signaled object or if 2 objects have been diff --git a/gpgme/wait.c b/gpgme/wait.c index ba7a22f1..71038fb3 100644 --- a/gpgme/wait.c +++ b/gpgme/wait.c @@ -213,7 +213,8 @@ _gpgme_wait_on_condition ( GpgmeCtx c, int hang, volatile int *cond ) } if (hang) run_idle (); - } while (hang); + } while (hang && !c->cancel ); + c->cancel = 0; /* fixme: fix all functions, to return a cancel error */ return c; } |