Merge pull request #5175 from DonLakeFlyer/EmergencyStop

Disarm while in air will pop Emergency Stop

Merge pull request #5175 from DonLakeFlyer/EmergencyStop
Disarm while in air will pop Emergency Stop
52c47fde · Don Gagne · GitHub · 07777bbe · 3d67039b · 52c47fde
Commit 52c47fde authored May 17, 2017 by Don Gagne Committed by GitHub May 17, 2017
--- 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 {