Dismiss dialogs when clicking an item off the toolstrip.

c08c23a3 · Gus Grubba · d1e85330 · c08c23a3
Commit c08c23a3 authored Apr 14, 2017 by Gus Grubba
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

FlightDisplayView.qml src/FlightDisplay/FlightDisplayView.qml +6 -4

No files found.
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -487,16 +487,18 @@ QGCView {
            ]

            onClicked: {
+                //-- Dismiss any other dialog
+                rootLoader.sourceComponent  = null
                guidedActionConfirm.visible = false
-                guidedActionList.visible = false
-                altitudeSlider.visible = false
+                guidedActionList.visible    = false
+                altitudeSlider.visible      = false
                var action = model[index].action
                if (action === -1) {
                    if (index == 4) {
-                        guidedActionList.model = _actionModel
+                        guidedActionList.model   = _actionModel
                        guidedActionList.visible = true
                    } else if (index == 5) {
-                        guidedActionList.model = _smartShotModel
+                        guidedActionList.model   = _smartShotModel
                        guidedActionList.visible = true
                    }
                } else {