From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 19 Apr 2012 15:19:56 +0000 (+0000)
Subject: -fixes
X-Git-Tag: initial-import-from-subversion-38251~13871
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=adf272d3c8a1620dbf6e49b1c57f5c0400487426;p=oweals%2Fgnunet.git

-fixes
---

diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index 0b56ce5c5..868268b10 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -330,11 +330,11 @@ parent_control_handler (void *cls,
   
   LOG (GNUNET_ERROR_TYPE_DEBUG, "`%s' invoked because of %d\n", __FUNCTION__,
        tc->reason);
-  if (tc->reason &
-      (GNUNET_SCHEDULER_REASON_SHUTDOWN | GNUNET_SCHEDULER_REASON_TIMEOUT |
-       GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+  if (0 != (tc->reason &
+	    (GNUNET_SCHEDULER_REASON_SHUTDOWN | GNUNET_SCHEDULER_REASON_TIMEOUT)))
   {
     GNUNET_DISK_file_close (control_pipe);
+    control_pipe = NULL;
     return;
   }
   ret = GNUNET_DISK_file_read (control_pipe, &sig, sizeof (sig));
@@ -343,6 +343,7 @@ parent_control_handler (void *cls,
     if (-1 == ret)
       LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "GNUNET_DISK_file_read");
     GNUNET_DISK_file_close (control_pipe);
+    control_pipe = NULL;
     return;
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Got control code %d from parent\n", sig);