summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2007-09-15 22:42:12 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2007-09-15 22:42:12 +0000
commit2da04fdae9dc863f5f82ae57825685bc88716a58 (patch)
treec19fe3e54b17d0f7daaef83762eebc9524cbb040 /rbutil
parent3c182d2b0a32f37ae98c97e3d71a369515c677ba (diff)
downloadrockbox-2da04fdae9dc863f5f82ae57825685bc88716a58.tar.gz
rockbox-2da04fdae9dc863f5f82ae57825685bc88716a58.tar.bz2
rockbox-2da04fdae9dc863f5f82ae57825685bc88716a58.zip
Use the correct config group when checking the bootloader requirement.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14719 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 13f004de5a..a2ac2b73ea 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -327,6 +327,7 @@ void RbUtilQt::completeInstall()
return;
}
// Bootloader
+ devices->beginGroup(userSettings->value("platform").toString());
if(devices->value("needsbootloader", "") == "yes") {
m_error = false;
m_installed = false;
@@ -341,7 +342,8 @@ void RbUtilQt::completeInstall()
if(m_error) return;
logger->undoAbort();
}
-
+ devices->endGroup();
+
// Rockbox
m_error = false;
m_installed = false;
@@ -349,7 +351,7 @@ void RbUtilQt::completeInstall()
return;
else
{
- // wait for boot loader installation finished
+ // wait for installation finished
while(!m_installed)
QApplication::processEvents();
}
@@ -363,7 +365,7 @@ void RbUtilQt::completeInstall()
return;
else
{
- // wait for boot loader installation finished
+ // wait for installation finished
while(!m_installed)
QApplication::processEvents();
}
@@ -379,14 +381,13 @@ void RbUtilQt::completeInstall()
return;
else
{
- // wait for boot loader installation finished
+ // wait for installation finished
while(!m_installed)
QApplication::processEvents();
}
if(m_error) return;
}
-
-
+
// theme
// this is a window
// it has its own logger window,so close our.
@@ -404,7 +405,7 @@ void RbUtilQt::smallInstall()
// create logger
logger = new ProgressLoggerGui(this);
logger->show();
-
+
QString mountpoint = userSettings->value("mountpoint").toString();
// show dialog with error if mount point is wrong
if(!QFileInfo(mountpoint).isDir()) {
@@ -413,6 +414,7 @@ void RbUtilQt::smallInstall()
return;
}
// Bootloader
+ devices->beginGroup(userSettings->value("platform").toString());
if(devices->value("needsbootloader", "") == "yes") {
m_error = false;
m_installed = false;
@@ -427,7 +429,8 @@ void RbUtilQt::smallInstall()
if(m_error) return;
logger->undoAbort();
}
-
+ devices->endGroup();
+
// Rockbox
m_error = false;
m_installed = false;
@@ -435,7 +438,7 @@ void RbUtilQt::smallInstall()
return;
else
{
- // wait for boot loader installation finished
+ // wait for installation finished
while(!m_installed)
QApplication::processEvents();
}