From: Marcus Brinkmann Date: Sun, 1 Sep 2002 19:47:11 +0000 (+0000) Subject: 2002-09-01 Marcus Brinkmann X-Git-Tag: gpgme-1.2.0@1385~833 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=433294f1a2515cbb59cf45f48cf33c1be1778f94;p=gpgme.git 2002-09-01 Marcus Brinkmann * 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/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 075eb46..a441c1a 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,3 +1,9 @@ +2002-09-01 Marcus Brinkmann + + * 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 * rungpg.c (_gpgme_gpg_op_edit): Add args from signers. diff --git a/trunk/gpgme/op-support.c b/trunk/gpgme/op-support.c index 125b723..bcaf832 100644 --- a/trunk/gpgme/op-support.c +++ b/trunk/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)