Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c
index 1d06cc6..cdaa87a 100644 (file)
--- a/src/simix/smx_context_base.c
+++ b/src/simix/smx_context_base.c
@@ -87,6 +87,7 @@ void smx_ctx_base_stop(smx_context_t context)
 {
   if (context->cleanup_func)
     (*(context->cleanup_func)) (context->data);
+  context->iwannadie = 0;
   SIMIX_req_process_cleanup(context->data);
 }