[GNUnet-SVN] r10054 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2010-01-18 17:17:25 +0100 (Mon, 18 Jan 2010)
New Revision: 10054

Modified:
   gnunet/src/core/core_api.c
Log:
fix

Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c  2010-01-18 16:11:21 UTC (rev 10053)
+++ gnunet/src/core/core_api.c  2010-01-18 16:17:25 UTC (rev 10054)
@@ -346,8 +346,11 @@
   if (NULL == (th = h->pending_head))
     return;                     /* no requests pending */
   GNUNET_assert (NULL == h->th);
-  GNUNET_SCHEDULER_cancel (h->sched, th->timeout_task);
-  th->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  if (GNUNET_SCHEDULER_NO_TASK != th->timeout_task)
+    {
+      GNUNET_SCHEDULER_cancel (h->sched, th->timeout_task);
+      th->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+    }
   h->th = GNUNET_CLIENT_notify_transmit_ready (h->client,
                                                th->msize,
                                                
GNUNET_TIME_absolute_get_remaining
@@ -807,8 +810,7 @@
                  GNUNET_i2s(&th->peer));
 #endif
       GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
-      if (th->timeout_task != GNUNET_SCHEDULER_NO_TASK)
-        GNUNET_CORE_notify_transmit_ready_cancel (th);
+      GNUNET_CORE_notify_transmit_ready_cancel (th);
       trigger_next_request (h);
       return 0;
     }