summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-09-02 22:30:19 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-09-02 22:30:19 +0200
commit1e8eb4752b679469b7f830c4ed97a1da1e607bad (patch)
treef5e0b2dd9c12a27dbf5942902298209ec8489bf3 /rbutil/rbutilqt
parent1ef14474c961ffc80dcf66df56050872ec7ece85 (diff)
downloadrockbox-1e8eb4752b679469b7f830c4ed97a1da1e607bad.tar.gz
rockbox-1e8eb4752b679469b7f830c4ed97a1da1e607bad.zip
Fix bootloader installation always being enable for Archos devices.
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
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/gui/selectiveinstallwidget.cpp19
1 files changed, 11 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
index ec55a81176..dfa9631a97 100644
--- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
@@ -123,6 +123,7 @@ void SelectiveInstallWidget::updateVersion(void)
// well as if the selected player doesn't need a bootloader.
if(m_blmethod == "none") {
ui.bootloaderCheckbox->setEnabled(false);
+ ui.bootloaderCheckbox->setChecked(false);
ui.bootloaderLabel->setEnabled(false);
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 "
"Rockbox. Installation of the bootloader is only necessary "
"on first time installation."));
+ // check if Rockbox is installed by looking after rockbox-info.txt.
+ // If installed uncheck bootloader installation.
+ RockboxInfo info(m_mountpoint);
+ ui.bootloaderCheckbox->setChecked(!info.success());
}
- // check if Rockbox is installed by looking after rockbox-info.txt.
- // If installed uncheck bootloader installation.
- RockboxInfo info(m_mountpoint);
- ui.bootloaderCheckbox->setChecked(!info.success());
}
@@ -209,10 +210,12 @@ void SelectiveInstallWidget::continueInstall(bool error)
if(m_installStage > 6) {
qDebug() << "[SelectiveInstallWidget] All install stages done.";
m_logger->setFinished();
- // check if Rockbox is installed by looking after rockbox-info.txt.
- // If installed uncheck bootloader installation.
- RockboxInfo info(m_mountpoint);
- ui.bootloaderCheckbox->setChecked(!info.success());
+ if(m_blmethod != "none") {
+ // check if Rockbox is installed by looking after rockbox-info.txt.
+ // If installed uncheck bootloader installation.
+ RockboxInfo info(m_mountpoint);
+ ui.bootloaderCheckbox->setChecked(!info.success());
+ }
}
}