Commit b6dbe951 authored by Gus Grubba's avatar Gus Grubba

Fix runtime QML warnings

parent 0806f857
...@@ -102,7 +102,7 @@ Rectangle { ...@@ -102,7 +102,7 @@ Rectangle {
onParameterReadyVehicleAvailableChanged: { onParameterReadyVehicleAvailableChanged: {
if(!QGroundControl.skipSetupPage) { if(!QGroundControl.skipSetupPage) {
if (parameterReadyVehicleAvailable || summaryButton.checked || setupButtonGroup.current != firmwareButton) { if (QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable || summaryButton.checked || setupButtonGroup.current != firmwareButton) {
// Show/Reload the Summary panel when: // Show/Reload the Summary panel when:
// A new vehicle shows up // A new vehicle shows up
// The summary panel is already showing and the active vehicle goes away // The summary panel is already showing and the active vehicle goes away
......
...@@ -38,9 +38,9 @@ Item { ...@@ -38,9 +38,9 @@ Item {
//-- Setup can be invoked from c++ side //-- Setup can be invoked from c++ side
Connections { Connections {
target: mainContentWindow target: setupWindow
onSourceChanged: { onVisibleChanged: {
if(mainContentWindow.source.toString().endsWith(setupViewSource)) { if(setupWindow.visible) {
setupButton.checked = true setupButton.checked = true
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment