summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp8
1 files changed, 7 insertions, 1 deletions
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()
462 m_error = false; 462 m_error = false;
463 m_installed = false; 463 m_installed = false;
464 m_auto = true; 464 m_auto = true;
465 if(!installBootloaderAuto()) 465 if(!installBootloaderAuto()) {
466 logger->abort();
466 return true; 467 return true;
468 }
467 else 469 else
468 { 470 {
469 // wait for boot loader installation finished 471 // wait for boot loader installation finished
@@ -665,6 +667,7 @@ void RbUtilQt::installBootloader()
665 if(m_auto) { 667 if(m_auto) {
666 // keep logger open for auto installs. 668 // keep logger open for auto installs.
667 // don't consider abort as error in auto-mode. 669 // don't consider abort as error in auto-mode.
670 logger->addItem(tr("Bootloader installation skipped"), LOGINFO);
668 installBootloaderPost(false); 671 installBootloaderPost(false);
669 } 672 }
670 else { 673 else {
@@ -714,7 +717,10 @@ void RbUtilQt::installBootloader()
714 "file."), 717 "file."),
715 QMessageBox::Ok | QMessageBox::Abort); 718 QMessageBox::Ok | QMessageBox::Abort);
716 if(ret != QMessageBox::Ok) { 719 if(ret != QMessageBox::Ok) {
720 // consider aborting an error to close window / abort automatic
721 // installation.
717 m_error = true; 722 m_error = true;
723 logger->addItem(tr("Bootloader installation aborted"), LOGINFO);
718 return; 724 return;
719 } 725 }
720 // open dialog to browse to hex file 726 // open dialog to browse to hex file