From cf28b0be38915472a7a0b526c231f99185a7ad7d Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 11 May 2019 13:46:19 -0700 Subject: [PATCH] Don't hideDialog when it doesn't flash --- src/VehicleSetup/FirmwareUpgrade.qml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml index 21111ee51..74bef1eb3 100644 --- a/src/VehicleSetup/FirmwareUpgrade.qml +++ b/src/VehicleSetup/FirmwareUpgrade.qml @@ -189,7 +189,6 @@ SetupPage { } function accept() { - hideDialog() if (_singleFirmwareMode) { controller.flashSingleFirmwareMode(controller.selectedFirmwareBuildType) } else { @@ -210,13 +209,18 @@ SetupPage { // Not ready yet, or no firmware available return } + var firmwareUrl = controller.apmFirmwareUrls[ardupilotFirmwareSelectionCombo.currentIndex] + if (firmwareUrl == "") { + return + } controller.flashFirmwareUrl(controller.apmFirmwareUrls[ardupilotFirmwareSelectionCombo.currentIndex]) + hideDialog() return } } } - controller.flash(stack, firmwareBuildType, vehicleType) + hideDialog() } } -- 2.22.0