summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index b1065936f7..76c8497a5b 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -521,16 +521,20 @@ void RbUtilQt::uninstallBootloader(void)
521 bl->setBlFile(blfilepath); 521 bl->setBlFile(blfilepath);
522 522
523 BootloaderInstallBase::BootloaderType currentbl = bl->installed(); 523 BootloaderInstallBase::BootloaderType currentbl = bl->installed();
524 if((bl->capabilities() & BootloaderInstallBase::Uninstall) == 0 524 if((bl->capabilities() & BootloaderInstallBase::Uninstall) == 0) {
525 || currentbl == BootloaderInstallBase::BootloaderUnknown
526 || currentbl == BootloaderInstallBase::BootloaderOther)
527 {
528 logger->addItem(tr("Rockbox Utility can not uninstall the bootloader on this target. " 525 logger->addItem(tr("Rockbox Utility can not uninstall the bootloader on this target. "
529 "Try a normal firmware update to remove the booloader."), LOGERROR); 526 "Try a normal firmware update to remove the booloader."), LOGERROR);
530 logger->setFinished(); 527 logger->setFinished();
531 delete bl; 528 delete bl;
532 return; 529 return;
533 } 530 }
531 if(currentbl == BootloaderInstallBase::BootloaderUnknown
532 || currentbl == BootloaderInstallBase::BootloaderOther) {
533 logger->addItem(tr("No Rockbox bootloader found."), LOGERROR);
534 logger->setFinished();
535 delete bl;
536 return;
537 }
534 538
535 connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); 539 connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
536 connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); 540 connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int)));