rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-02 19:29:15 +01:00
Code Issues Releases Activity

Merge branch 'samguns/OP-XXXX_wizard_freeze_workaround' into rel-nano-15.05

Browse Source
This commit is contained in:
abeck70 2015-05-29 21:41:28 +10:00
commit 6b2d217efe
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
View File

@ -49,6 +49,7 @@ void AutoUpdatePage::autoUpdate()
Q_ASSERT(uploader); Q_ASSERT(uploader);
m_isUpdating = true; m_isUpdating = true;
uploader->autoUpdate(ui->eraseSettings->isChecked()); uploader->autoUpdate(ui->eraseSettings->isChecked());
getWizard()->setRestartNeeded(true);
} }
void AutoUpdatePage::updateStatus(uploader::ProgressStep status, QVariant value) void AutoUpdatePage::updateStatus(uploader::ProgressStep status, QVariant value)

4
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
View File

@ -100,7 +100,9 @@ int SetupWizard::nextId() const
return PAGE_INPUT; return PAGE_INPUT;
case CONTROLLER_NANO: case CONTROLLER_NANO:
reboot(); if (isRestartNeeded()) {
reboot();
}
return PAGE_INPUT; return PAGE_INPUT;
case CONTROLLER_OPLINK: case CONTROLLER_OPLINK: