From: Christophe Thiéry <christopho128@gmail.com>
Date: Wed, 20 Apr 2011 16:18:18 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3_6_rc3~130^2^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/30ab48e9e35dd3cf55081b954dce212d56f00733?hp=c7ff77c2e7f934ad3e6234b09b7f80047544ed7c

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 1d06cc63eb..cdaa87a259 100644
--- 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);
 }