X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e77f9b669473408dae3f99f8cb0d95a822b9053..3718b81f92488f30d14590c0b69b13c3843604d5:/src/smpi/include/smpi_comm.hpp

diff --git a/src/smpi/include/smpi_comm.hpp b/src/smpi/include/smpi_comm.hpp
index f54a743c8b..34881bc3df 100644
--- a/src/smpi/include/smpi_comm.hpp
+++ b/src/smpi/include/smpi_comm.hpp
@@ -13,6 +13,7 @@
 #include "smpi_keyvals.hpp"
 #include "smpi_group.hpp"
 #include "smpi_topo.hpp"
+#include "smpi_config.hpp"
 
 namespace simgrid{
 namespace smpi{
@@ -36,7 +37,7 @@ class Comm : public F2C, public Keyval{
   std::string name_;
   MPI_Info info_ = MPI_INFO_NULL;
   int id_;
-  MPI_Errhandler errhandler_ = MPI_ERRORS_ARE_FATAL;
+  MPI_Errhandler errhandler_ =  _smpi_cfg_default_errhandler_is_error ? MPI_ERRORS_ARE_FATAL : MPI_ERRORS_RETURN;;
   MPI_Errhandler* errhandlers_ = nullptr; //for MPI_COMM_WORLD only
 
 public: