gpgme/gpgme (ChangeLog wait-global.c)

[cvs user marcus]

    Date: Thursday, April 14, 2005 @ 10:41:12
  Author: marcus
    Path: /cvs/gpgme/gpgme/gpgme

Modified: ChangeLog wait-global.c

2005-04-14  Marcus Brinkmann  <marcus at g10code.de>

	* wait-global.c (gpgme_wait): If no context is found, and we
	should not hang, set *status to 0 and return NULL.
	Reported by Igor Belyi <gpgme at katehok.ac93.org>.


---------------+
 ChangeLog     |    6 ++++++
 wait-global.c |    6 ++++++
 2 files changed, 12 insertions(+)


Index: gpgme/gpgme/ChangeLog
diff -u gpgme/gpgme/ChangeLog:1.394 gpgme/gpgme/ChangeLog:1.395
--- gpgme/gpgme/ChangeLog:1.394	Thu Mar 24 14:09:54 2005
+++ gpgme/gpgme/ChangeLog	Thu Apr 14 10:41:12 2005
@@ -1,3 +1,9 @@
+2005-04-14  Marcus Brinkmann  <marcus at g10code.de>
+
+	* wait-global.c (gpgme_wait): If no context is found, and we
+	should not hang, set *status to 0 and return NULL.
+	Reported by Igor Belyi <gpgme at katehok.ac93.org>.
+
 2005-03-24  Marcus Brinkmann  <marcus at g10code.de>
 
 	* data.h (EOPNOTSUPP) [_WIN32]: Remove definition.
Index: gpgme/gpgme/wait-global.c
diff -u gpgme/gpgme/wait-global.c:1.12 gpgme/gpgme/wait-global.c:1.13
--- gpgme/gpgme/wait-global.c:1.12	Thu Mar 24 14:05:12 2005
+++ gpgme/gpgme/wait-global.c	Thu Apr 14 10:41:12 2005
@@ -350,6 +350,12 @@
 	    ctx = dctx;
 	    hang = 0;
 	  }
+	else if (!hang)
+	  {
+	    ctx = NULL;
+	    if (status)
+	      *status = NULL;
+	  }
       }
     }
   while (hang);