From d0f7a8181bb761ce627b10b002c5906129664804 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sun, 1 Jul 2012 12:33:06 +0200
Subject: [PATCH] Be more specific on bootloader uninstallation errors.

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
---
 rbutil/rbutilqt/rbutilqt.cpp | 12 ++++++++----
 1 file 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)
     bl->setBlFile(blfilepath);
 
     BootloaderInstallBase::BootloaderType currentbl = bl->installed();
-    if((bl->capabilities() & BootloaderInstallBase::Uninstall) == 0
-            || currentbl == BootloaderInstallBase::BootloaderUnknown
-            || currentbl == BootloaderInstallBase::BootloaderOther)
-    {
+    if((bl->capabilities() & BootloaderInstallBase::Uninstall) == 0) {
         logger->addItem(tr("Rockbox Utility can not uninstall the bootloader on this target. "
                             "Try a normal firmware update to remove the booloader."), LOGERROR);
         logger->setFinished();
         delete bl;
         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(logProgress(int, int)), logger, SLOT(setProgress(int, int)));