From: Marcus Brinkmann <mb@g10code.com>
Date: Wed, 10 Mar 2004 23:52:18 +0000 (+0000)
Subject: 2004-03-11  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-0-4-6~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dcb04fb19521a507ef5bd49027d528fca969aebe;p=gpgme.git

2004-03-11  Marcus Brinkmann  <marcus@g10code.de>

	* engine-gpgsm.c (gpgsm_cancel): Only call assuan_disconnect if
	GPGSM->assuan_ctx is not NULL.  Set it to NULL afterwards.
---

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 38f8f43..248a1d1 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-11  Marcus Brinkmann  <marcus@g10code.de>
+
+	* engine-gpgsm.c (gpgsm_cancel): Only call assuan_disconnect if
+	GPGSM->assuan_ctx is not NULL.  Set it to NULL afterwards.
+
 2004-03-07  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpgme-config.in: Do not emit include and lib directory for
diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 1101131..bbcdb42 100644
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -289,7 +289,11 @@ gpgsm_cancel (void *engine)
   if (gpgsm->message_cb.fd != -1)
     _gpgme_io_close (gpgsm->message_cb.fd);
 
-  assuan_disconnect (gpgsm->assuan_ctx);
+  if (gpgsm->assuan_ctx)
+    {
+      assuan_disconnect (gpgsm->assuan_ctx);
+      gpgsm->assuan_ctx = NULL;
+    }
 
   return 0;
 }