Be consistent and hold mutex in any case when returning from condition_t::timedwait().

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 9799ff8c91f8d3c154756f2ffe2f35aa11f02607..e148574a6ba72b31106398e92ab97d04d34688ed 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -203,7 +203,7 @@ int main(int argc, char* argv[])
     double simulated_time = -1.0;
     timestamp elapsed_time(timestamp::wallclock_time);
     timestamp simulation_time(timestamp::cpu_time);
-    MSG_error_t res;
+    msg_error_t res;
 
     elapsed_time.start();
     simulation_time.start();
@@ -234,7 +234,7 @@ int main(int argc, char* argv[])
                 "Compiled on " << version::date << "\n\n";
         if (!parse_res || opt::help_requested)
             opt::usage();
-        MSG_clean();
+        res = MSG_clean();
         exit(parse_res ? EXIT_NO_FAILURE : EXIT_FAILURE_ARGS);
     }
     XBT_INFO("%s v%s (%s)", opt::program_name.c_str(), version::num.c_str(),