Fixed #666: Segfault on calling hpx::finalize twice

STEllAR-GROUP · Jan 15, 2013 · 4aa7be0 · 4aa7be0
1 parent fdf64ba
commit 4aa7be0
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/hpx_init.cpp b/src/hpx_init.cpp
@@ -1021,6 +1021,9 @@ namespace hpx
             return -1;
         }
 
+        if (&ec != &throws)
+            ec = make_success_code();
+
         if (std::abs(localwait - 1.0) < 1e-16)
             localwait = detail::get_option("hpx.finalize_wait_time", -1.0);
         else
@@ -1053,6 +1056,9 @@ namespace hpx
             return -1;
         }
 
+        if (&ec != &throws)
+            ec = make_success_code();
+
         if (std::abs(localwait - 1.0) < 1e-16)
             localwait = detail::get_option("hpx.finalize_wait_time", -1.0);
         else