summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/base/utils.cpp1
-rw-r--r--rbutil/rbutilqt/gui/selectiveinstallwidget.cpp29
2 files changed, 15 insertions, 15 deletions
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp
index 60bacd709e..3821b67201 100644
--- a/rbutil/rbutilqt/base/utils.cpp
+++ b/rbutil/rbutilqt/base/utils.cpp
@@ -299,6 +299,7 @@ QString Utils::findExecutable(QString name)
299 */ 299 */
300QString Utils::checkEnvironment(bool permission) 300QString Utils::checkEnvironment(bool permission)
301{ 301{
302 qDebug() << "[Utils] checking environment";
302 QString text = ""; 303 QString text = "";
303 304
304 // check permission 305 // check permission
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
index ec8ce1cc64..ec55a81176 100644
--- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
@@ -157,9 +157,23 @@ void SelectiveInstallWidget::startInstall(void)
157{ 157{
158 qDebug() << "[SelectiveInstallWidget] starting installation"; 158 qDebug() << "[SelectiveInstallWidget] starting installation";
159 saveSettings(); 159 saveSettings();
160
160 m_installStage = 0; 161 m_installStage = 0;
161 if(m_logger != NULL) delete m_logger; 162 if(m_logger != NULL) delete m_logger;
162 m_logger = new ProgressLoggerGui(this); 163 m_logger = new ProgressLoggerGui(this);
164 QString warning = Utils::checkEnvironment(false);
165 if(!warning.isEmpty())
166 {
167 warning += "<br/>" + tr("Continue with installation?");
168 if(QMessageBox::warning(this, tr("Really continue?"), warning,
169 QMessageBox::Ok | QMessageBox::Abort, QMessageBox::Abort)
170 == QMessageBox::Abort)
171 {
172 emit installSkipped(true);
173 return;
174 }
175 }
176
163 m_logger->show(); 177 m_logger->show();
164 if(!QFileInfo(m_mountpoint).isDir()) { 178 if(!QFileInfo(m_mountpoint).isDir()) {
165 m_logger->addItem(tr("Mountpoint is wrong"), LOGERROR); 179 m_logger->addItem(tr("Mountpoint is wrong"), LOGERROR);
@@ -360,21 +374,6 @@ void SelectiveInstallWidget::installRockbox(void)
360 RbSettings::setValue(RbSettings::Build, selected); 374 RbSettings::setValue(RbSettings::Build, selected);
361 RbSettings::sync(); 375 RbSettings::sync();
362 376
363 QString warning = Utils::checkEnvironment(false);
364 if(!warning.isEmpty())
365 {
366 warning += "<br/>" + tr("Continue with installation?");
367 if(QMessageBox::warning(this, tr("Really continue?"), warning,
368 QMessageBox::Ok | QMessageBox::Abort, QMessageBox::Abort)
369 == QMessageBox::Abort)
370 {
371 m_logger->addItem(tr("Aborted!"),LOGERROR);
372 m_logger->setFinished();
373 emit installSkipped(true);
374 return;
375 }
376 }
377
378 if(selected == "release") url = ServerInfo::platformValue(m_target, 377 if(selected == "release") url = ServerInfo::platformValue(m_target,
379 ServerInfo::CurReleaseUrl).toString(); 378 ServerInfo::CurReleaseUrl).toString();
380 else if(selected == "development") url = ServerInfo::platformValue(m_target, 379 else if(selected == "development") url = ServerInfo::platformValue(m_target,