diff options
-rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 19 |
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) | |||
123 | // well as if the selected player doesn't need a bootloader. | 123 | // well as if the selected player doesn't need a bootloader. |
124 | if(m_blmethod == "none") { | 124 | if(m_blmethod == "none") { |
125 | ui.bootloaderCheckbox->setEnabled(false); | 125 | ui.bootloaderCheckbox->setEnabled(false); |
126 | ui.bootloaderCheckbox->setChecked(false); | ||
126 | ui.bootloaderLabel->setEnabled(false); | 127 | ui.bootloaderLabel->setEnabled(false); |
127 | ui.bootloaderLabel->setText(tr("The selected player doesn't need a bootloader.")); | 128 | ui.bootloaderLabel->setText(tr("The selected player doesn't need a bootloader.")); |
128 | } | 129 | } |
@@ -132,12 +133,12 @@ void SelectiveInstallWidget::updateVersion(void) | |||
132 | ui.bootloaderLabel->setText(tr("The bootloader is required for starting " | 133 | ui.bootloaderLabel->setText(tr("The bootloader is required for starting " |
133 | "Rockbox. Installation of the bootloader is only necessary " | 134 | "Rockbox. Installation of the bootloader is only necessary " |
134 | "on first time installation.")); | 135 | "on first time installation.")); |
136 | // check if Rockbox is installed by looking after rockbox-info.txt. | ||
137 | // If installed uncheck bootloader installation. | ||
138 | RockboxInfo info(m_mountpoint); | ||
139 | ui.bootloaderCheckbox->setChecked(!info.success()); | ||
135 | } | 140 | } |
136 | 141 | ||
137 | // check if Rockbox is installed by looking after rockbox-info.txt. | ||
138 | // If installed uncheck bootloader installation. | ||
139 | RockboxInfo info(m_mountpoint); | ||
140 | ui.bootloaderCheckbox->setChecked(!info.success()); | ||
141 | 142 | ||
142 | } | 143 | } |
143 | 144 | ||
@@ -209,10 +210,12 @@ void SelectiveInstallWidget::continueInstall(bool error) | |||
209 | if(m_installStage > 6) { | 210 | if(m_installStage > 6) { |
210 | qDebug() << "[SelectiveInstallWidget] All install stages done."; | 211 | qDebug() << "[SelectiveInstallWidget] All install stages done."; |
211 | m_logger->setFinished(); | 212 | m_logger->setFinished(); |
212 | // check if Rockbox is installed by looking after rockbox-info.txt. | 213 | if(m_blmethod != "none") { |
213 | // If installed uncheck bootloader installation. | 214 | // check if Rockbox is installed by looking after rockbox-info.txt. |
214 | RockboxInfo info(m_mountpoint); | 215 | // If installed uncheck bootloader installation. |
215 | ui.bootloaderCheckbox->setChecked(!info.success()); | 216 | RockboxInfo info(m_mountpoint); |
217 | ui.bootloaderCheckbox->setChecked(!info.success()); | ||
218 | } | ||
216 | } | 219 | } |
217 | } | 220 | } |
218 | 221 | ||