blobmsg: drop old comment about json formatting functions

[oweals/libubox.git] / runqueue.c

diff --git a/runqueue.c b/runqueue.c
index 1784e304b8555188fd6e70a81b1bf37c9344dda0..d5719d1f7fdb756afdb5749cbf56d36e686e53c7 100644 (file)
--- a/runqueue.c
+++ b/runqueue.c
@@ -196,11 +196,10 @@ void runqueue_task_kill(struct runqueue_task *t)
        if (!t->queued)
                return;
 
-       runqueue_task_complete(t);
        if (running && t->type->kill)
                t->type->kill(q, t);
 
-       runqueue_start_next(q);
+       runqueue_task_complete(t);
 }
 
 void runqueue_stop(struct runqueue *q)
@@ -224,13 +223,15 @@ void runqueue_task_complete(struct runqueue_task *t)
        if (t->running)
                t->q->running_tasks--;
 
+       uloop_timeout_cancel(&t->timeout);
+
        safe_list_del(&t->list);
        t->queued = false;
        t->running = false;
        t->cancelled = false;
        if (t->complete)
                t->complete(q, t);
-       runqueue_start_next(t->q);
+       runqueue_start_next(q);
 }
 
 static void