devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix bootloader installation always being enable for Archos devices.

Browse source 
Archos devices don't need a bootloader, but the automatic enabling of the
bootloader installation didn't handle this case, making a first time
installation impossible. Fix this by respecting the "none" bootloader case
separately.

Change-Id: I9b06348401f525c5447cf4ce061f2463083c0e61
This commit is contained in:
Dominik Riebeling 2012-09-02 22:30:19 +02:00
parent 1ef14474c9
commit 1e8eb4752b
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
View file

@ -123,6 +123,7 @@ void SelectiveInstallWidget::updateVersion(void)
// well as if the selected player doesn't need a bootloader. // well as if the selected player doesn't need a bootloader.
if(m_blmethod == "none") { if(m_blmethod == "none") {
ui.bootloaderCheckbox->setEnabled(false); ui.bootloaderCheckbox->setEnabled(false);
ui.bootloaderCheckbox->setChecked(false);
ui.bootloaderLabel->setEnabled(false); ui.bootloaderLabel->setEnabled(false);
ui.bootloaderLabel->setText(tr("The selected player doesn't need a bootloader.")); ui.bootloaderLabel->setText(tr("The selected player doesn't need a bootloader."));
} }
@ -132,12 +133,12 @@ void SelectiveInstallWidget::updateVersion(void)
ui.bootloaderLabel->setText(tr("The bootloader is required for starting " ui.bootloaderLabel->setText(tr("The bootloader is required for starting "
"Rockbox. Installation of the bootloader is only necessary " "Rockbox. Installation of the bootloader is only necessary "
"on first time installation.")); "on first time installation."));
}
// check if Rockbox is installed by looking after rockbox-info.txt. // check if Rockbox is installed by looking after rockbox-info.txt.
// If installed uncheck bootloader installation. // If installed uncheck bootloader installation.
RockboxInfo info(m_mountpoint); RockboxInfo info(m_mountpoint);
ui.bootloaderCheckbox->setChecked(!info.success()); ui.bootloaderCheckbox->setChecked(!info.success());
}
} }
@ -209,12 +210,14 @@ void SelectiveInstallWidget::continueInstall(bool error)
if(m_installStage > 6) { if(m_installStage > 6) {
qDebug() << "[SelectiveInstallWidget] All install stages done."; qDebug() << "[SelectiveInstallWidget] All install stages done.";
m_logger->setFinished(); m_logger->setFinished();
if(m_blmethod != "none") {
// check if Rockbox is installed by looking after rockbox-info.txt. // check if Rockbox is installed by looking after rockbox-info.txt.
// If installed uncheck bootloader installation. // If installed uncheck bootloader installation.
RockboxInfo info(m_mountpoint); RockboxInfo info(m_mountpoint);
ui.bootloaderCheckbox->setChecked(!info.success()); ui.bootloaderCheckbox->setChecked(!info.success());
} }
} }
}
void SelectiveInstallWidget::installBootloader(void) void SelectiveInstallWidget::installBootloader(void)