Browse Source

Merge pull request #2992 from DonLakeFlyer/FlashBug

Flash: Correct return after error
QGC4.4
Don Gagne 9 years ago
parent
commit
0d7fd3ce11
  1. 2
      src/VehicleSetup/PX4FirmwareUpgradeThread.cc

2
src/VehicleSetup/PX4FirmwareUpgradeThread.cc

@ -299,6 +299,7 @@ void PX4FirmwareUpgradeThreadWorker::_flash(void) @@ -299,6 +299,7 @@ void PX4FirmwareUpgradeThreadWorker::_flash(void)
_bootloaderPort = NULL;
qCDebug(FirmwareUpgradeLog) << "Program failed:" << _bootloader->errorString();
emit error(_bootloader->errorString());
return;
}
emit status("Verifying program...");
@ -309,6 +310,7 @@ void PX4FirmwareUpgradeThreadWorker::_flash(void) @@ -309,6 +310,7 @@ void PX4FirmwareUpgradeThreadWorker::_flash(void)
} else {
qCDebug(FirmwareUpgradeLog) << "Verify failed:" << _bootloader->errorString();
emit error(_bootloader->errorString());
return;
}
}

Loading…
Cancel
Save