summaryrefslogtreecommitdiffstats
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()
}
QString myversion = "r" + versmap.value("bleed_rev");
-
+
// check installed Version and Target
- QString rbVersion = Detect::installedVersion(settings->mountpoint());
+ QString rbVersion = Detect::installedVersion(settings->mountpoint());
+ QString warning = Detect::check(settings, false, settings->curTargetId());
- if(Detect::check(settings,false,settings->curTargetId()) == false)
+ if(!warning.isEmpty())
{
- logger->addItem(tr("Aborted!"),LOGERROR);
- logger->abort();
- return false;
+ if(QMessageBox::warning(this, tr("Really continue?"), warning,
+ QMessageBox::Ok | QMessageBox::Abort, QMessageBox::Abort) == QMessageBox::Abort)
+ {
+ logger->addItem(tr("Aborted!"), LOGERROR);
+ logger->abort();
+ return false;
+ }
}
-
+
// check version
if(rbVersion != "")
{
@@ -516,7 +521,7 @@ bool RbUtilQt::installAuto()
{
logger->addItem(tr("Starting backup..."),LOGINFO);
QString backupName = settings->mountpoint() + "/.backup/rockbox-backup-"+rbVersion+".zip";
-
+
//! create dir, if it doesnt exist
QFileInfo backupFile(backupName);
if(!QDir(backupFile.path()).exists())