[autopilot] unkill in manual was not possible when AP_MODE_STARTING i…

…s AP_MODE_KILL
paparazzi · Dec 15, 2014 · 1bd5ba8 · 1bd5ba8
1 parent bef1557
commit 1bd5ba8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sw/airborne/firmwares/rotorcraft/autopilot.c b/sw/airborne/firmwares/rotorcraft/autopilot.c
@@ -515,8 +515,8 @@ void autopilot_on_rc_frame(void) {
   /* an arming sequence is used to start/stop motors.
    * only allow switching motor if not in KILL mode and ahrs is aligned
    */
+  autopilot_arming_check_motors_on();
   if (autopilot_mode != AP_MODE_KILL && ahrs_is_aligned()) {
-    autopilot_arming_check_motors_on();
     kill_throttle = ! autopilot_motors_on;
   }