2002-09-01 Marcus Brinkmann <marcus@g10code.de>

	* op-support.c (_gpgme_op_reset): Set CTX->pending after calling
	_gpgme_engine_release, as this will reset pending to zero in the
	event done callback on cancelled operations.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 075eb46bae46215dc7959ab2a3db1bdc4572ebd3..a441c1ae2f475f488ad6b952a45973a5ac4c594d 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-01  Marcus Brinkmann  <marcus@g10code.de>
+
+       * op-support.c (_gpgme_op_reset): Set CTX->pending after calling
+       _gpgme_engine_release, as this will reset pending to zero in the
+       event done callback on cancelled operations.
+
 2002-08-30  Marcus Brinkmann  <marcus@g10code.de>
 
        * rungpg.c (_gpgme_gpg_op_edit): Add args from signers.

diff --git a/gpgme/op-support.c b/gpgme/op-support.c
index 125b7230cc601eefe86428e1867f2806f6dc0633..bcaf83277b513cf3f9e3123876f88ba79e840510 100644 (file)
--- a/gpgme/op-support.c
+++ b/gpgme/op-support.c
@@ -35,13 +35,12 @@ _gpgme_op_reset (GpgmeCtx ctx, int type)
   struct GpgmeIOCbs io_cbs;
 
   fail_on_pending_request (ctx);
-  ctx->pending = 1;
-
   _gpgme_release_result (ctx);
 
   /* Create an engine object.  */
   _gpgme_engine_release (ctx->engine);
   ctx->engine = NULL;
+  ctx->pending = 1;
   err = _gpgme_engine_new (ctx->use_cms ? GPGME_PROTOCOL_CMS
                           : GPGME_PROTOCOL_OpenPGP, &ctx->engine);
   if (err)