[GNUnet-SVN] r21036 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2012-04-19 17:19:56 +0200 (Thu, 19 Apr 2012)
New Revision: 21036

Modified:
   gnunet/src/util/os_priority.c
Log:
-fixes

Modified: gnunet/src/util/os_priority.c
===================================================================
--- gnunet/src/util/os_priority.c       2012-04-19 15:18:08 UTC (rev 21035)
+++ gnunet/src/util/os_priority.c       2012-04-19 15:19:56 UTC (rev 21036)
@@ -330,11 +330,11 @@
   
   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 @@
     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);