len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-10 05:32:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Be more specific on bootloader uninstallation errors.

Browse source 
When Rockbox Utility can't figure if the installed bootloader is a Rockbox
bootloader don't tell the user that it can't uninstall the bootloader but be
more specific stating that no Rockbox bootloader has been found.

Change-Id: I8e1eae4bdba30da87d10d2dc11fb9d48e176de2a
This commit is contained in:
Dominik Riebeling 2012-07-01 12:33:06 +02:00
parent bf1c491c2b
commit d0f7a8181b
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -521,16 +521,20 @@ void RbUtilQt::uninstallBootloader(void)
bl->setBlFile(blfilepath); bl->setBlFile(blfilepath);
BootloaderInstallBase::BootloaderType currentbl = bl->installed(); BootloaderInstallBase::BootloaderType currentbl = bl->installed();
if((bl->capabilities() & BootloaderInstallBase::Uninstall) == 0 if((bl->capabilities() & BootloaderInstallBase::Uninstall) == 0) {
|| currentbl == BootloaderInstallBase::BootloaderUnknown
|| currentbl == BootloaderInstallBase::BootloaderOther)
{
logger->addItem(tr("Rockbox Utility can not uninstall the bootloader on this target. " logger->addItem(tr("Rockbox Utility can not uninstall the bootloader on this target. "
"Try a normal firmware update to remove the booloader."), LOGERROR); "Try a normal firmware update to remove the booloader."), LOGERROR);
logger->setFinished(); logger->setFinished();
delete bl; delete bl;
return; return;
} }
if(currentbl == BootloaderInstallBase::BootloaderUnknown
|| currentbl == BootloaderInstallBase::BootloaderOther) {
logger->addItem(tr("No Rockbox bootloader found."), LOGERROR);
logger->setFinished();
delete bl;
return;
}
connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int)));