From 0dc3b23b59312782a3eb7e5b8624d3fa527f31b4 Mon Sep 17 00:00:00 2001
From: rmackay9 <rmackay9@yahoo.com>
Date: Sat, 18 Aug 2012 13:21:41 +0900
Subject: [PATCH] ArduCopter: fixed small bug re arming_counter for TOY mode

---
 ArduCopter/motors.pde | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ArduCopter/motors.pde b/ArduCopter/motors.pde
index 2cac2eed54..998d973e3a 100644
--- a/ArduCopter/motors.pde
+++ b/ArduCopter/motors.pde
@@ -17,7 +17,7 @@ static void arm_motors()
 		return;
 	}
 
-	if ((control_mode > ACRO) && ((control_mode != TOY_A) || (control_mode != TOY_M))){
+	if ((control_mode > ACRO) && ((control_mode != TOY_A) && (control_mode != TOY_M))){
 		arming_counter = 0;
 		return;
 	}