fix conflict resolution mistakes

ros · Jul 20, 2017 · 8cad7d6 · 8cad7d6
1 parent 2962689
commit 8cad7d6
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/bondcpp/src/bond.cpp b/bondcpp/src/bond.cpp
@@ -232,13 +232,12 @@ bool Bond::waitUntilBroken(ros::WallDuration timeout)
   boost::mutex::scoped_lock lock(mutex_);
   ros::SteadyTime deadline(ros::SteadyTime::now() + timeout);
 
-  while (sm_.getState().getId() != SM::Dead.getId())
-  {
-    if (!ros::ok())
+  while (sm_.getState().getId() != SM::Dead.getId()) {
+    if (!ros::ok()) {
       break;
     }
 
-    ros::SteadyTime deadline(ros::SteadyTime::now() + timeout);
+    ros::WallDuration wait_time = ros::WallDuration(0.1);
     if (timeout >= ros::WallDuration(0.0)) {
       wait_time = std::min(wait_time, deadline - ros::SteadyTime::now());
     }