summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/rbutilqt.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp21
1 files changed, 13 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index e9f6f7fcf2..8c0691c52b 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -496,17 +496,22 @@ bool RbUtilQt::installAuto()
496 } 496 }
497 497
498 QString myversion = "r" + versmap.value("bleed_rev"); 498 QString myversion = "r" + versmap.value("bleed_rev");
499 499
500 // check installed Version and Target 500 // check installed Version and Target
501 QString rbVersion = Detect::installedVersion(settings->mountpoint()); 501 QString rbVersion = Detect::installedVersion(settings->mountpoint());
502 QString warning = Detect::check(settings, false, settings->curTargetId());
502 503
503 if(Detect::check(settings,false,settings->curTargetId()) == false) 504 if(!warning.isEmpty())
504 { 505 {
505 logger->addItem(tr("Aborted!"),LOGERROR); 506 if(QMessageBox::warning(this, tr("Really continue?"), warning,
506 logger->abort(); 507 QMessageBox::Ok | QMessageBox::Abort, QMessageBox::Abort) == QMessageBox::Abort)
507 return false; 508 {
509 logger->addItem(tr("Aborted!"), LOGERROR);
510 logger->abort();
511 return false;
512 }
508 } 513 }
509 514
510 // check version 515 // check version
511 if(rbVersion != "") 516 if(rbVersion != "")
512 { 517 {
@@ -516,7 +521,7 @@ bool RbUtilQt::installAuto()
516 { 521 {
517 logger->addItem(tr("Starting backup..."),LOGINFO); 522 logger->addItem(tr("Starting backup..."),LOGINFO);
518 QString backupName = settings->mountpoint() + "/.backup/rockbox-backup-"+rbVersion+".zip"; 523 QString backupName = settings->mountpoint() + "/.backup/rockbox-backup-"+rbVersion+".zip";
519 524
520 //! create dir, if it doesnt exist 525 //! create dir, if it doesnt exist
521 QFileInfo backupFile(backupName); 526 QFileInfo backupFile(backupName);
522 if(!QDir(backupFile.path()).exists()) 527 if(!QDir(backupFile.path()).exists())