From 71b0d5fb6d623916543a93cb687d4aca8153db0e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Sun, 3 Jan 2016 16:46:34 +1100
Subject: [PATCH] Plane: disable quad motors in TRAINING and ACRO too

---
 ArduPlane/quadplane.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ArduPlane/quadplane.cpp b/ArduPlane/quadplane.cpp
index d00d7ddce6..c774fcc204 100644
--- a/ArduPlane/quadplane.cpp
+++ b/ArduPlane/quadplane.cpp
@@ -659,8 +659,10 @@ float QuadPlane::desired_yaw_rate_cds(void)
  */
 void QuadPlane::update_transition(void)
 {
-    if (plane.control_mode == MANUAL) {
-        // in manual mode quad motors are always off
+    if (plane.control_mode == MANUAL ||
+        plane.control_mode == ACRO ||
+        plane.control_mode == TRAINING) {
+        // in manual modes quad motors are always off
         motors->output_min();
         transition_state = TRANSITION_DONE;
         return;