From 2c0699c9ed5d18b4869dd58262b2d3a914d2f3b3 Mon Sep 17 00:00:00 2001
From: Randy Mackay <rmackay9@yahoo.com>
Date: Thu, 31 Jul 2014 22:58:02 +0900
Subject: [PATCH] Copter: auto-disarm in Drift, Sport, OF_Loiter

---
 ArduCopter/motors.pde | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ArduCopter/motors.pde b/ArduCopter/motors.pde
index 8850168e4e..9d87247887 100644
--- a/ArduCopter/motors.pde
+++ b/ArduCopter/motors.pde
@@ -103,7 +103,9 @@ static void auto_disarm_check()
     }
 
     // allow auto disarm in manual flight modes or Loiter/AltHold if we're landed
-    if(manual_flight_mode(control_mode) || (ap.land_complete && (control_mode == LOITER || control_mode == ALT_HOLD || control_mode == POSHOLD || control_mode == AUTOTUNE))) {
+    if (manual_flight_mode(control_mode) || (ap.land_complete && (control_mode == ALT_HOLD || control_mode == LOITER || control_mode == OF_LOITER ||
+                                                                  control_mode == DRIFT || control_mode == SPORT || control_mode == AUTOTUNE ||
+                                                                  control_mode == POSHOLD))) {
         auto_disarming_counter++;
 
         if(auto_disarming_counter >= AUTO_DISARMING_DELAY) {