len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-14 15:42:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use the correct config group when checking the bootloader requirement.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14719 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2007-09-15 22:42:12 +00:00
parent 3c182d2b0a
commit 2da04fdae9
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -327,6 +327,7 @@ void RbUtilQt::completeInstall()
return; return;
} }
// Bootloader // Bootloader
devices->beginGroup(userSettings->value("platform").toString());
if(devices->value("needsbootloader", "") == "yes") { if(devices->value("needsbootloader", "") == "yes") {
m_error = false; m_error = false;
m_installed = false; m_installed = false;
@ -341,7 +342,8 @@ void RbUtilQt::completeInstall()
if(m_error) return; if(m_error) return;
logger->undoAbort(); logger->undoAbort();
} }
devices->endGroup();
// Rockbox // Rockbox
m_error = false; m_error = false;
m_installed = false; m_installed = false;
@ -349,7 +351,7 @@ void RbUtilQt::completeInstall()
return; return;
else else
{ {
// wait for boot loader installation finished // wait for installation finished
while(!m_installed) while(!m_installed)
QApplication::processEvents(); QApplication::processEvents();
} }
@ -363,7 +365,7 @@ void RbUtilQt::completeInstall()
return; return;
else else
{ {
// wait for boot loader installation finished // wait for installation finished
while(!m_installed) while(!m_installed)
QApplication::processEvents(); QApplication::processEvents();
} }
@ -379,14 +381,13 @@ void RbUtilQt::completeInstall()
return; return;
else else
{ {
// wait for boot loader installation finished // wait for installation finished
while(!m_installed) while(!m_installed)
QApplication::processEvents(); QApplication::processEvents();
} }
if(m_error) return; if(m_error) return;
} }
// theme // theme
// this is a window // this is a window
// it has its own logger window,so close our. // it has its own logger window,so close our.
@ -404,7 +405,7 @@ void RbUtilQt::smallInstall()
// create logger // create logger
logger = new ProgressLoggerGui(this); logger = new ProgressLoggerGui(this);
logger->show(); logger->show();
QString mountpoint = userSettings->value("mountpoint").toString(); QString mountpoint = userSettings->value("mountpoint").toString();
// show dialog with error if mount point is wrong // show dialog with error if mount point is wrong
if(!QFileInfo(mountpoint).isDir()) { if(!QFileInfo(mountpoint).isDir()) {
@ -413,6 +414,7 @@ void RbUtilQt::smallInstall()
return; return;
} }
// Bootloader // Bootloader
devices->beginGroup(userSettings->value("platform").toString());
if(devices->value("needsbootloader", "") == "yes") { if(devices->value("needsbootloader", "") == "yes") {
m_error = false; m_error = false;
m_installed = false; m_installed = false;
@ -427,7 +429,8 @@ void RbUtilQt::smallInstall()
if(m_error) return; if(m_error) return;
logger->undoAbort(); logger->undoAbort();
} }
devices->endGroup();
// Rockbox // Rockbox
m_error = false; m_error = false;
m_installed = false; m_installed = false;
@ -435,7 +438,7 @@ void RbUtilQt::smallInstall()
return; return;
else else
{ {
// wait for boot loader installation finished // wait for installation finished
while(!m_installed) while(!m_installed)
QApplication::processEvents(); QApplication::processEvents();
} }