From 8e162ec35b6e074858ee9359be0961c4f83c434a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 3 Mar 2012 12:50:46 +1100
Subject: [PATCH] APM: fixed reset of control switch when short_fs_action is
 disabled

When FS_SHORT_ACTN is 0, we should not re-read the control switch
unless we changed mode on the initial short fs action
---
 ArduPlane/events.pde | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ArduPlane/events.pde b/ArduPlane/events.pde
index 412c67ec5d..c219d38f39 100644
--- a/ArduPlane/events.pde
+++ b/ArduPlane/events.pde
@@ -71,7 +71,10 @@ static void failsafe_short_off_event()
 
 	// re-read the switch so we can return to our preferred mode
 	// --------------------------------------------------------
-	reset_control_switch();
+    if (control_mode == CIRCLE ||
+        (g.short_fs_action == 1 && control_mode == RTL)) {
+        reset_control_switch();
+    }
 
 	// Reset control integrators
 	// ---------------------