summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2014-11-14 22:32:17 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2015-05-02 16:52:13 +0200
commit43b1ccffcc2df42146bde053bb13e5168dfa2334 (patch)
treec33688f5e25ea242ccb95474edad225b4d2f3e77
parentc3c2c919d820c01cbad04e76ba329919f2827e8a (diff)
downloadrockbox-43b1ccffcc2df42146bde053bb13e5168dfa2334.tar.gz
rockbox-43b1ccffcc2df42146bde053bb13e5168dfa2334.zip
Add note to boot OF for update with OF on uninstallation.
Change-Id: Ia2955ecc9616eaa91644970ef81320e23a7970a0
-rw-r--r--rbutil/rbutilqt/changelog.txt2
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp7
2 files changed, 7 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/changelog.txt b/rbutil/rbutilqt/changelog.txt
index 5e03d1e6c3..d11122455c 100644
--- a/rbutil/rbutilqt/changelog.txt
+++ b/rbutil/rbutilqt/changelog.txt
@@ -22,3 +22,5 @@ Version 1.4
22 22
23Version 1.4.1 23Version 1.4.1
24* Fix crash on detecting player in MTP mode. 24* Fix crash on detecting player in MTP mode.
25* Extend hint when uninstallation requires reinstalling the Original Firmware.
26
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 5da792ffc1..b1ea041858 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -539,8 +539,11 @@ void RbUtilQt::uninstallBootloader(void)
539 539
540 BootloaderInstallBase::BootloaderType currentbl = bl->installed(); 540 BootloaderInstallBase::BootloaderType currentbl = bl->installed();
541 if((bl->capabilities() & BootloaderInstallBase::Uninstall) == 0) { 541 if((bl->capabilities() & BootloaderInstallBase::Uninstall) == 0) {
542 logger->addItem(tr("Rockbox Utility can not uninstall the bootloader on this target. " 542 logger->addItem(tr("Rockbox Utility can not uninstall the bootloader on your player. "
543 "Try a normal firmware update to remove the booloader."), LOGERROR); 543 "Please perform a firmware update using your player vendors "
544 "firmware update process."), LOGERROR);
545 logger->addItem(tr("Important: make sure to boot your player into the original "
546 "firmware before using the vendors firmware update process."), LOGERROR);
544 logger->setFinished(); 547 logger->setFinished();
545 delete bl; 548 delete bl;
546 return; 549 return;