From 3d67039b5e2a65e0acf144c0af2a470e1fba4398 Mon Sep 17 00:00:00 2001
From: Don Gagne <Don@laptop-3.local>
Date: Wed, 17 May 2017 18:41:51 -0700
Subject: [PATCH] Disarm while in air will pop Emergency Stop

---
 src/ui/MainWindowInner.qml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/ui/MainWindowInner.qml b/src/ui/MainWindowInner.qml
index 3a7ebe1..8d88cdb 100644
--- a/src/ui/MainWindowInner.qml
+++ b/src/ui/MainWindowInner.qml
@@ -273,7 +273,13 @@ Item {
         onShowFlyView:          mainWindow.showFlyView()
         onShowAnalyzeView:      mainWindow.showAnalyzeView()
         onArmVehicle:           flightView.guidedController.confirmAction(flightView.guidedController.actionArm)
-        onDisarmVehicle:        flightView.guidedController.confirmAction(flightView.guidedController.actionDisarm)
+        onDisarmVehicle: {
+            if (flightView.guidedController.showEmergenyStop) {
+                flightView.guidedController.confirmAction(flightView.guidedController.actionEmergencyStop)
+            } else {
+                flightView.guidedController.confirmAction(flightView.guidedController.actionDisarm)
+            }
+        }
 
         //-- Entire tool bar area disable on cammand
         MouseArea {