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.
This commit is contained in:
Marcus Brinkmann 2002-09-01 19:47:11 +00:00
parent ee97cfaa5d
commit 1731657df0
2 changed files with 7 additions and 2 deletions

View File

@ -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> 2002-08-30 Marcus Brinkmann <marcus@g10code.de>
* rungpg.c (_gpgme_gpg_op_edit): Add args from signers. * rungpg.c (_gpgme_gpg_op_edit): Add args from signers.

View File

@ -35,13 +35,12 @@ _gpgme_op_reset (GpgmeCtx ctx, int type)
struct GpgmeIOCbs io_cbs; struct GpgmeIOCbs io_cbs;
fail_on_pending_request (ctx); fail_on_pending_request (ctx);
ctx->pending = 1;
_gpgme_release_result (ctx); _gpgme_release_result (ctx);
/* Create an engine object. */ /* Create an engine object. */
_gpgme_engine_release (ctx->engine); _gpgme_engine_release (ctx->engine);
ctx->engine = NULL; ctx->engine = NULL;
ctx->pending = 1;
err = _gpgme_engine_new (ctx->use_cms ? GPGME_PROTOCOL_CMS err = _gpgme_engine_new (ctx->use_cms ? GPGME_PROTOCOL_CMS
: GPGME_PROTOCOL_OpenPGP, &ctx->engine); : GPGME_PROTOCOL_OpenPGP, &ctx->engine);
if (err) if (err)