diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-05-12 15:17:32 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-05-12 15:17:32 +0000 |
commit | 1bd2d5220b3483c6e6eeed3f5c9017e44612826f (patch) | |
tree | c9550f944d1e01c955c5d59bdbe64a1fc5048759 /src/arm | |
parent | dfe92a2c1f3b70c7551714a666220568ca8d6b3b (diff) | |
download | gnunet-1bd2d5220b3483c6e6eeed3f5c9017e44612826f.tar.gz gnunet-1bd2d5220b3483c6e6eeed3f5c9017e44612826f.zip |
fix
Diffstat (limited to 'src/arm')
-rw-r--r-- | src/arm/gnunet-service-arm.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 19e43f464..e357668d3 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -688,10 +688,16 @@ clean_up_running () | |||
688 | static void | 688 | static void |
689 | do_shutdown () | 689 | do_shutdown () |
690 | { | 690 | { |
691 | GNUNET_SERVER_destroy (server); | 691 | if (NULL != server) |
692 | server = NULL; | 692 | { |
693 | GNUNET_SCHEDULER_cancel (child_death_task); | 693 | GNUNET_SERVER_destroy (server); |
694 | child_death_task = GNUNET_SCHEDULER_NO_TASK; | 694 | server = NULL; |
695 | } | ||
696 | if (GNUNET_SCHEDULER_NO_TASK != child_death_task) | ||
697 | { | ||
698 | GNUNET_SCHEDULER_cancel (child_death_task); | ||
699 | child_death_task = GNUNET_SCHEDULER_NO_TASK; | ||
700 | } | ||
695 | } | 701 | } |
696 | 702 | ||
697 | #if DELAY_SHUTDOWN | 703 | #if DELAY_SHUTDOWN |