From 4423d20acc02b00dcc11226e53ab18a01bce5c8c Mon Sep 17 00:00:00 2001
From: Michael Keller <github@ike.ch>
Date: Wed, 31 Aug 2016 13:33:26 +1200
Subject: [PATCH] Made AIRMODE and 3D override 'auto_disarm_delay', to make it
 consistent with handling of MOTOR_STOP.

---
 src/main/mw.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/mw.c b/src/main/mw.c
index 20580b66a..08bf53420 100644
--- a/src/main/mw.c
+++ b/src/main/mw.c
@@ -572,6 +572,8 @@ void processRx(void)
     if (ARMING_FLAG(ARMED)
         && feature(FEATURE_MOTOR_STOP)
         && !STATE(FIXED_WING)
+		&& !feature(FEATURE_3D)
+		&& !isAirmodeActive()
     ) {
         if (isUsingSticksForArming()) {
             if (throttleStatus == THROTTLE_LOW) {