guard against deadlock by checking if we're already shutting down

2009-11-09 22:18:42 +00:00 · 2009-11-09 22:18:42 +00:00 · 553a94bc1f
parent 4844c882bd
commit 553a94bc1f
1 changed files with 1 additions and 1 deletions
--- a/core/roscpp/src/libros/init.cpp
+++ b/core/roscpp/src/libros/init.cpp
@ -127,7 +127,7 @@ void requestShutdown()

 void atexitCallback()
 {
-  if (ok())
+  if (ok() && !isShuttingDown())
  {
    ROS_INFO("shutting down due to exit() or end of main() without cleanup of all NodeHandles");
    shutdown();