Avoid deadlock in ConnectionManager::Stop (gazebosim#2950)

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
scpeters · Apr 14, 2021 · 61265a9 · 61265a9
1 parent 1102ff2
commit 61265a9
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/gazebo/transport/ConnectionManager.cc b/gazebo/transport/ConnectionManager.cc
@@ -215,6 +215,9 @@ void ConnectionManager::Fini()
     return;
 
   this->Stop();
+  if (this->initialized)
+    while (this->stopped == false)
+      common::Time::MSleep(100);
 
   if (this->masterConn)
   {
@@ -244,10 +247,6 @@ void ConnectionManager::Fini()
 void ConnectionManager::Stop()
 {
   this->stop = true;
-  this->updateCondition.notify_all();
-  if (this->initialized)
-    while (this->stopped == false)
-      common::Time::MSleep(100);
 }
 
 //////////////////////////////////////////////////