From 10c1fef096d250edbdea530552a7f59de2a3ed7f Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sat, 28 Feb 2009 23:11:26 +0000
Subject: Fix automated install not aborting when bootloader installation was
 canceled during prerequisite confirmation. Add info to the log window when
 cancelled or skipped.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20147 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/rbutilqt.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 585ea17e78..8cab489a1e 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -462,8 +462,10 @@ bool RbUtilQt::smallInstallInner()
         m_error = false;
         m_installed = false;
         m_auto = true;
-        if(!installBootloaderAuto())
+        if(!installBootloaderAuto()) {
+            logger->abort();
             return true;
+        }
         else
         {
             // wait for boot loader installation finished
@@ -665,6 +667,7 @@ void RbUtilQt::installBootloader()
                 if(m_auto) {
                     // keep logger open for auto installs.
                     // don't consider abort as error in auto-mode.
+                    logger->addItem(tr("Bootloader installation skipped"), LOGINFO);
                     installBootloaderPost(false);
                 }
                 else {
@@ -714,7 +717,10 @@ void RbUtilQt::installBootloader()
                "file."),
                QMessageBox::Ok | QMessageBox::Abort);
         if(ret != QMessageBox::Ok) {
+            // consider aborting an error to close window / abort automatic
+            // installation.
             m_error = true;
+            logger->addItem(tr("Bootloader installation aborted"), LOGINFO);
             return;
         }
         // open dialog to browse to hex file
-- 
cgit v1.2.3