summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/install.cpp
diff options
context:
space:
mode:
authorDominik Wenger <domonoky@googlemail.com>2008-06-27 21:53:22 +0000
committerDominik Wenger <domonoky@googlemail.com>2008-06-27 21:53:22 +0000
commit7fb11a82a1f899655e7d5a4a6ff5c39d9dc27b8f (patch)
tree88e64d6ce08ba120e6d879c23d93a26ec497f52f /rbutil/rbutilqt/install.cpp
parent3867cf9181b105900a965fa12568c21469fec135 (diff)
downloadrockbox-7fb11a82a1f899655e7d5a4a6ff5c39d9dc27b8f.tar.gz
rockbox-7fb11a82a1f899655e7d5a4a6ff5c39d9dc27b8f.zip
rbutil: move some detecting code, to make detecing things nicer
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17813 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/install.cpp')
-rw-r--r--rbutil/rbutilqt/install.cpp26
1 files changed, 8 insertions, 18 deletions
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp
index 8ee1dc1ff5..d45b374f70 100644
--- a/rbutil/rbutilqt/install.cpp
+++ b/rbutil/rbutilqt/install.cpp
@@ -20,7 +20,7 @@
#include "install.h"
#include "ui_installfrm.h"
#include "rbzip.h"
-#include "utils.h"
+#include "detect.h"
Install::Install(RbSettings *sett,QWidget *parent) : QDialog(parent)
{
@@ -35,7 +35,7 @@ Install::Install(RbSettings *sett,QWidget *parent) : QDialog(parent)
connect(ui.backup,SIGNAL(stateChanged(int)),this,SLOT(backupCheckboxChanged(int)));
//! check if rockbox is already installed
- QString version = installedVersion(settings->mountpoint());
+ QString version = Detect::installedVersion(settings->mountpoint());
if(version != "")
{
@@ -120,23 +120,13 @@ void Install::accept()
return;
}
settings->sync();
-
- int rbTarget = installedTargetId(settings->mountpoint());
- if(rbTarget != -1 && rbTarget != settings->curTargetId())
+
+ if(Detect::check(settings,false,settings->curTargetId()) == false)
{
- if(QMessageBox::question(this, tr("Device mismatch detected"),
- tr("Device mismatch detected.\n\n"
- "Installed Rockbox is for Device: %1.\n"
- "New Rockbox is for Device: %2.\n\n"
- "Do you want to continue?").arg(settings->nameOfTargetId(rbTarget),settings->curName()),
- QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)
- {
- logger->addItem(tr("Aborted!"),LOGERROR);
- logger->abort();
- return;
- }
- }
-
+ logger->addItem(tr("Aborted!"),LOGERROR);
+ logger->abort();
+ return;
+ }
//! check if we should backup
if(ui.backup->isChecked())