Copter: fix Helicopter no-build issue

Conflict with another recent change to disarm counter
2015-11-13 19:59:59 -05:00 · 2015-11-13 19:59:59 -05:00 · 2b111c2bd6
commit 2b111c2bd6
parent f8f2833c88
1 changed files with 1 additions and 1 deletions
--- 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