X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..5e7d79b763a5f55d1afb579d2b5a8d30ccfe869c:/src/simix/popping.cpp

diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp
index 2672a4a86c..daeacbdd67 100644
--- a/src/simix/popping.cpp
+++ b/src/simix/popping.cpp
@@ -34,9 +34,10 @@ void SIMIX_simcall_answer(smx_simcall_t simcall)
   }
 }
 
-void SIMIX_simcall_exit(smx_activity_t synchro)
+void SIMIX_simcall_exit(smx_activity_t activity)
 {
-  synchro->post();
+  if (activity != nullptr) // When migrating, the surf activity is disconnected from its simix activity before cancel
+    activity->post();
 }
 
 void SIMIX_run_kernel(std::function<void()> const* code)