From c08c23a37649daaec3894d25266c9755bdda4278 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Fri, 14 Apr 2017 14:04:29 -0400 Subject: [PATCH] Dismiss dialogs when clicking an item off the toolstrip. --- src/FlightDisplay/FlightDisplayView.qml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 407cbc067..2fac8c414 100644 --- 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 { -- 2.22.0