Browse Source

Fix runtime QML warnings

QGC4.4
Gus Grubba 6 years ago
parent
commit
b6dbe95178
  1. 2
      src/VehicleSetup/SetupView.qml
  2. 6
      src/ui/toolbar/MainToolBar.qml

2
src/VehicleSetup/SetupView.qml

@ -102,7 +102,7 @@ Rectangle { @@ -102,7 +102,7 @@ Rectangle {
onParameterReadyVehicleAvailableChanged: {
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:
// A new vehicle shows up
// The summary panel is already showing and the active vehicle goes away

6
src/ui/toolbar/MainToolBar.qml

@ -38,9 +38,9 @@ Item { @@ -38,9 +38,9 @@ Item {
//-- Setup can be invoked from c++ side
Connections {
target: mainContentWindow
onSourceChanged: {
if(mainContentWindow.source.toString().endsWith(setupViewSource)) {
target: setupWindow
onVisibleChanged: {
if(setupWindow.visible) {
setupButton.checked = true
}
}

Loading…
Cancel
Save