Commit 15ef8c0e authored by Gus Grubba's avatar Gus Grubba

Explicitly invoke setup page complete when needed

parent 7ae6f211
......@@ -33,7 +33,7 @@ SetupPage {
readonly property string dialogTitle: qsTr("Radio")
onSetupPageCompleted: {
function setupPageCompleted() {
controller.start()
updateChannelCount()
}
......
......@@ -32,7 +32,6 @@ Item {
property real availableHeight: height - pageLoader.y
property bool showAdvanced: false
property alias advanced: advancedCheckBox.checked
property bool setupPageCompleted: false
property bool _vehicleIsRover: activeVehicle ? activeVehicle.rover : false
property bool _vehicleArmed: activeVehicle ? activeVehicle.armed : false
......@@ -45,7 +44,9 @@ Item {
property string _pageTitle: qsTr("%1 Setup").arg(pageName)
Component.onCompleted: {
setupPageCompleted = true
if(pageLoader.item && pageLoader.item.setupPageCompleted) {
pageLoader.item.setupPageCompleted()
}
}
QGCFlickable {
......
......@@ -73,9 +73,7 @@ SetupPage {
controller.cancel()
}
QGCPalette { id: qgcPal; colorGroupEnabled: true }
onSetupPageCompleted: {
function setupPageCompleted() {
controller.startBoardSearch()
_defaultFirmwareIsPX4 = _defaultFirmwareFact.rawValue === _defaultFimwareTypePX4 // we don't want this to be bound and change as radios are selected
}
......
......@@ -50,7 +50,7 @@ SetupPage {
property var _activeJoystick: joystickManager.activeJoystick
onSetupPageCompleted: {
function setupPageCompleted() {
controller.start()
}
......
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