From 08986c7df7a5b961760f42afe4ba0d948a59adb0 Mon Sep 17 00:00:00 2001 From: "Dr. Denis" Date: Thu, 1 Feb 2024 20:23:37 +0100 Subject: [PATCH] Fix conflict resolution error. --- controller_manager/src/controller_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controller_manager/src/controller_manager.cpp b/controller_manager/src/controller_manager.cpp index 83ae6a91cd..a1ca8b0795 100644 --- a/controller_manager/src/controller_manager.cpp +++ b/controller_manager/src/controller_manager.cpp @@ -1234,8 +1234,8 @@ controller_interface::return_type ControllerManager::switch_controller( RCLCPP_DEBUG(get_logger(), " - %s", interface.c_str()); } - if (!resource_manager_->prepare_command_mode_switch( - activate_command_interface_request_, deactivate_command_interface_request_)) + if ( + !activate_command_interface_request_.empty() || !deactivate_command_interface_request_.empty()) { if (!resource_manager_->prepare_command_mode_switch( activate_command_interface_request_, deactivate_command_interface_request_))