From 322d2b46cd6fa67e62e5ee3e9198b8c48c766eca Mon Sep 17 00:00:00 2001 From: Dominik Wenger Date: Wed, 29 Aug 2007 17:41:06 +0000 Subject: rbutilQt: fix a bootloader message, and fixed that the bootloader log entry was shown in the normal uninstall dialog. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14521 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/rbutilqt.cpp | 2 ++ rbutil/rbutilqt/uninstall.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'rbutil') diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 776fdfdd76..78629b0d1b 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -557,6 +557,8 @@ void RbUtilQt::installBootloader() } else if(ret == QMessageBox::Ignore) { + logger->addItem(tr("Bootloader installation Skipped!"),LOGERROR); + logger->abort(); m_installed = true; return; } diff --git a/rbutil/rbutilqt/uninstall.cpp b/rbutil/rbutilqt/uninstall.cpp index dfbd0182c9..ad31e1db38 100644 --- a/rbutil/rbutilqt/uninstall.cpp +++ b/rbutil/rbutilqt/uninstall.cpp @@ -113,7 +113,9 @@ void Uninstaller::uninstall(ProgressloggerInterface* dp) QStringList Uninstaller::getAllSections() { QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); - return installlog.childGroups(); + QStringList allSections = installlog.childGroups(); + allSections.removeAt(allSections.lastIndexOf("Bootloader")); + return allSections; } -- cgit v1.2.3