Merge pull request #1107 from mikeller/disable_auto_disarm_in_airmode

Made AIRMODE and 3D override 'auto_disarm_delay', to make it consistent with handling of MOTOR_STOP.

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) {