devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

rbutil: fix closing of installwindow after successful install.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16920 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2008-04-01 20:22:45 +00:00
parent 1f75bd5a8e
commit 0a73b16a93
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rbutil/rbutilqt/installzip.cpp
View file

@ -62,7 +62,7 @@ void ZipInstaller::installContinue()
m_dp->addItem(tr("Installation finished successfully."),LOGOK); m_dp->addItem(tr("Installation finished successfully."),LOGOK);
m_dp->abort(); m_dp->abort();
emit done(true); emit done(false);
return; return;
} }
@ -114,14 +114,14 @@ void ZipInstaller::downloadDone(bool error)
if(getter->httpResponse() != 200 && !getter->isCached()) { if(getter->httpResponse() != 200 && !getter->isCached()) {
m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR);
m_dp->abort(); m_dp->abort();
emit done(false); emit done(true);
return; return;
} }
if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO); if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO);
if(error) { if(error) {
m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR);
m_dp->abort(); m_dp->abort();
emit done(false); emit done(true);
return; return;
} }
else m_dp->addItem(tr("Download finished."),LOGOK); else m_dp->addItem(tr("Download finished."),LOGOK);
@ -141,7 +141,7 @@ void ZipInstaller::downloadDone(bool error)
m_dp->addItem(tr("Opening archive failed: %1.") m_dp->addItem(tr("Opening archive failed: %1.")
.arg(uz.formatError(ec)),LOGERROR); .arg(uz.formatError(ec)),LOGERROR);
m_dp->abort(); m_dp->abort();
emit done(false); emit done(true);
return; return;
} }
@ -150,7 +150,7 @@ void ZipInstaller::downloadDone(bool error)
m_dp->addItem(tr("Extracting failed: %1.") m_dp->addItem(tr("Extracting failed: %1.")
.arg(uz.formatError(ec)),LOGERROR); .arg(uz.formatError(ec)),LOGERROR);
m_dp->abort(); m_dp->abort();
emit done(false); emit done(true);
return; return;
} }
// prepare file list for log // prepare file list for log
@ -171,7 +171,7 @@ void ZipInstaller::downloadDone(bool error)
if(!downloadFile->copy(m_mountpoint + m_target)) { if(!downloadFile->copy(m_mountpoint + m_target)) {
m_dp->addItem(tr("Installing file failed."), LOGERROR); m_dp->addItem(tr("Installing file failed."), LOGERROR);
m_dp->abort(); m_dp->abort();
emit done(false); emit done(true);
return; return;
} }