Merge pull request #5175 from DonLakeFlyer/EmergencyStop

Disarm while in air will pop Emergency Stop
8 years ago · 52c47fdef9
1 changed files with 7 additions and 1 deletions
--- a/src/ui/MainWindowInner.qml
+++ b/src/ui/MainWindowInner.qml
@ -273,7 +273,13 @@ Item {
				@@ -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 {