diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-01-25 17:48:38 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-01-25 17:48:38 +0000 |
commit | 6343111e00da93a8b792b4e6245184be31b8feff (patch) | |
tree | 531790bb8bebad377717a66f390f097da83a91de /rbutil/rbutilqt/rbutilqt.cpp | |
parent | 07894de36dd2af7054db87fc00dc953f73c72f0d (diff) | |
download | rockbox-6343111e00da93a8b792b4e6245184be31b8feff.tar.gz rockbox-6343111e00da93a8b792b4e6245184be31b8feff.zip |
Remove "needsbootloader" configuration value as it is implicitly available from "bootloadermethod". Explicitly use bootloadermethod "none" if no bootloader is needed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19855 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 5ef43b6732..585ea17e78 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -315,7 +315,7 @@ void RbUtilQt::updateSettings() | |||
315 | 315 | ||
316 | void RbUtilQt::updateDevice() | 316 | void RbUtilQt::updateDevice() |
317 | { | 317 | { |
318 | if(!settings->curNeedsBootloader() ) { | 318 | if(settings->curBootloaderMethod() == "none" ) { |
319 | ui.buttonBootloader->setEnabled(false); | 319 | ui.buttonBootloader->setEnabled(false); |
320 | ui.buttonRemoveBootloader->setEnabled(false); | 320 | ui.buttonRemoveBootloader->setEnabled(false); |
321 | ui.labelBootloader->setEnabled(false); | 321 | ui.labelBootloader->setEnabled(false); |
@@ -333,7 +333,7 @@ void RbUtilQt::updateDevice() | |||
333 | ui.buttonRemoveBootloader->setEnabled(true); | 333 | ui.buttonRemoveBootloader->setEnabled(true); |
334 | } | 334 | } |
335 | } | 335 | } |
336 | 336 | ||
337 | // displayed device info | 337 | // displayed device info |
338 | QString mountpoint = settings->mountpoint(); | 338 | QString mountpoint = settings->mountpoint(); |
339 | QString brand = settings->curBrand(); | 339 | QString brand = settings->curBrand(); |
@@ -457,7 +457,7 @@ bool RbUtilQt::smallInstallInner() | |||
457 | return true; | 457 | return true; |
458 | } | 458 | } |
459 | // Bootloader | 459 | // Bootloader |
460 | if(settings->curNeedsBootloader()) | 460 | if(settings->curBootloaderMethod() != "none") |
461 | { | 461 | { |
462 | m_error = false; | 462 | m_error = false; |
463 | m_installed = false; | 463 | m_installed = false; |