Fix conflict resolution error.

ros-controls · Feb 1, 2024 · 08986c7 · 08986c7
1 parent d03f295
commit 08986c7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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_))