From 2b111c2bd62212bca99b0d922ae64636b5b3f989 Mon Sep 17 00:00:00 2001
From: Robert Lefebvre <robert.lefebvre@gmail.com>
Date: Fri, 13 Nov 2015 19:59:59 -0500
Subject: [PATCH] Copter: fix Helicopter no-build issue

Conflict with another recent change to disarm counter
---
 ArduCopter/motors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ArduCopter/motors.cpp b/ArduCopter/motors.cpp
index ed41f1b070..3fdcd43d94 100644
--- a/ArduCopter/motors.cpp
+++ b/ArduCopter/motors.cpp
@@ -85,7 +85,7 @@ void Copter::auto_disarm_check()
 #if FRAME_CONFIG == HELI_FRAME
     // if the rotor is still spinning, don't initiate auto disarm
     if (motors.rotor_speed_above_critical()) {
-        auto_disarming_counter = 0;
+        auto_disarm_begin = tnow_ms;
         return;
     }
 #endif