Merge pull request #80 in SWDEV/franka_ros from controller-switch-fix to develop

* commit '9fecd084':
  Don't run ROS callback before exiting loop
  Exit control loop if controller was deactivated

franka_hw/include/franka_hw/franka_hw.h

@@ -174,7 +174,7 @@ class FrankaHW : public hardware_interface::RobotHW {
                     const franka::RobotState& robot_state,
                     franka::Duration time_step) {
     robot_state_ = robot_state;
-    if (ros_callback && !ros_callback(robot_state, time_step) || !controller_active_) {
+    if (!controller_active_ || ros_callback && !ros_callback(robot_state, time_step)) {
       return franka::MotionFinished(command);
     }
     return command;