2008-08-08 Marcus Brinkmann <marcus@g10code.com>

	* rungpg.c (command_handler): Remove I/O callback on error, too.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 39c6165fb430a042a0d469c70a0dba13964ebb1a..4629cc243a824045b0508cb77f5e406f8384c7b3 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-08  Marcus Brinkmann  <marcus@g10code.com>
+
+       * rungpg.c (command_handler): Remove I/O callback on error, too.
+
 2008-06-29  Marcus Brinkmann  <marcus@ulysses.g10code.com>
 
        * gpgme.c (gpgme_cancel_async): Remove unused variable.

diff --git a/trunk/gpgme/rungpg.c b/trunk/gpgme/rungpg.c
index 51ca545b0a68547cc264c91db4eeaa7231fb79bf..ca4145ca95d2941f29aacabed4c6e5f013a56d26 100644 (file)
--- a/trunk/gpgme/rungpg.c
+++ b/trunk/gpgme/rungpg.c
@@ -645,12 +645,6 @@ command_handler (void *opaque, int fd)
 
   err = gpg->cmd.fnc (gpg->cmd.fnc_value, gpg->cmd.code, gpg->cmd.keyword, fd,
                      &processed);
-  if (err)
-    return err;
-
-  /* We always need to send at least a newline character.  */
-  if (!processed)
-    _gpgme_io_write (fd, "\n", 1);
 
   gpg->cmd.code = 0;
   /* And sleep again until read_status will wake us up again.  */
@@ -660,6 +654,13 @@ command_handler (void *opaque, int fd)
   gpg->cmd.fd = gpg->fd_data_map[gpg->cmd.idx].fd;
   gpg->fd_data_map[gpg->cmd.idx].fd = -1;
 
+  if (err)
+    return err;
+
+  /* We always need to send at least a newline character.  */
+  if (!processed)
+    _gpgme_io_write (fd, "\n", 1);
+
   return 0;
 }