1 files changed, 2 insertions, 1 deletions
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;
 }