Merge branch 'humble' into humble

rhaschke · Jul 12, 2024 · 53bcc5a · 53bcc5a
2 parents a9f5dc2 + 3f54256
commit 53bcc5a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...troller_manager/include/moveit_simple_controller_manager/action_based_controller_handle.h b/...troller_manager/include/moveit_simple_controller_manager/action_based_controller_handle.h
@@ -145,7 +145,7 @@ class ActionBasedControllerHandle : public ActionBasedControllerHandleBase
         do
         {
           status = result_future.wait_for(50ms);
-          if ((status == std::future_status::timeout) and ((node_->now() - start) > timeout))
+          if ((status == std::future_status::timeout) && ((node_->now() - start) > timeout))
           {
             RCLCPP_WARN(LOGGER, "waitForExecution timed out");
             return false;