From: Marcus Brinkmann <mb@g10code.com>
Date: Fri, 8 Aug 2008 17:53:22 +0000 (+0000)
Subject: 2008-08-08  Marcus Brinkmann  <marcus@g10code.com>
X-Git-Tag: gpgme-1.1.8~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=569829b6fd4d50daff3fb86b57bed3cb6af32bd0;p=gpgme.git

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

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

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 39c6165..4629cc2 100644
--- a/gpgme/ChangeLog
+++ b/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/gpgme/rungpg.c b/gpgme/rungpg.c
index 51ca545..ca4145c 100644
--- a/gpgme/rungpg.c
+++ b/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;
 }