fix the logic for existing tests

ros-controls · Oct 13, 2024 · fbf9b68 · fbf9b68
1 parent d1daa53
commit fbf9b68
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/controller_manager/src/controller_manager.cpp b/controller_manager/src/controller_manager.cpp
@@ -1117,7 +1117,10 @@ controller_interface::return_type ControllerManager::switch_controller(
       status = check_following_controllers_for_activate(controllers, strictness, controller_it);
     }
 
-    status = check_fallback_controllers_state_pre_activation(controllers, controller_it);
+    if (status == controller_interface::return_type::OK)
+    {
+      status = check_fallback_controllers_state_pre_activation(controllers, controller_it);
+    }
 
     if (status != controller_interface::return_type::OK)
     {