diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2008-04-01 20:22:45 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2008-04-01 20:22:45 +0000 |
commit | 0a73b16a93ab648687c3cf7fb3aa86d00bbe3f14 (patch) | |
tree | 50c843db4f4c059db2aa88ed1d9840fb078aba6b /rbutil/rbutilqt/installzip.cpp | |
parent | 1f75bd5a8e95894ff664f908ce43dbb93f7cabf3 (diff) | |
download | rockbox-0a73b16a93ab648687c3cf7fb3aa86d00bbe3f14.tar.gz rockbox-0a73b16a93ab648687c3cf7fb3aa86d00bbe3f14.zip |
rbutil: fix closing of installwindow after successful install.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16920 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/installzip.cpp')
-rw-r--r-- | rbutil/rbutilqt/installzip.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/installzip.cpp b/rbutil/rbutilqt/installzip.cpp index 880082a86d..ae9cabdc24 100644 --- a/rbutil/rbutilqt/installzip.cpp +++ b/rbutil/rbutilqt/installzip.cpp | |||
@@ -62,7 +62,7 @@ void ZipInstaller::installContinue() | |||
62 | m_dp->addItem(tr("Installation finished successfully."),LOGOK); | 62 | m_dp->addItem(tr("Installation finished successfully."),LOGOK); |
63 | m_dp->abort(); | 63 | m_dp->abort(); |
64 | 64 | ||
65 | emit done(true); | 65 | emit done(false); |
66 | return; | 66 | return; |
67 | } | 67 | } |
68 | 68 | ||
@@ -114,14 +114,14 @@ void ZipInstaller::downloadDone(bool error) | |||
114 | if(getter->httpResponse() != 200 && !getter->isCached()) { | 114 | if(getter->httpResponse() != 200 && !getter->isCached()) { |
115 | m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); | 115 | m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); |
116 | m_dp->abort(); | 116 | m_dp->abort(); |
117 | emit done(false); | 117 | emit done(true); |
118 | return; | 118 | return; |
119 | } | 119 | } |
120 | if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO); | 120 | if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO); |
121 | if(error) { | 121 | if(error) { |
122 | m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); | 122 | m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); |
123 | m_dp->abort(); | 123 | m_dp->abort(); |
124 | emit done(false); | 124 | emit done(true); |
125 | return; | 125 | return; |
126 | } | 126 | } |
127 | else m_dp->addItem(tr("Download finished."),LOGOK); | 127 | else m_dp->addItem(tr("Download finished."),LOGOK); |
@@ -141,7 +141,7 @@ void ZipInstaller::downloadDone(bool error) | |||
141 | m_dp->addItem(tr("Opening archive failed: %1.") | 141 | m_dp->addItem(tr("Opening archive failed: %1.") |
142 | .arg(uz.formatError(ec)),LOGERROR); | 142 | .arg(uz.formatError(ec)),LOGERROR); |
143 | m_dp->abort(); | 143 | m_dp->abort(); |
144 | emit done(false); | 144 | emit done(true); |
145 | return; | 145 | return; |
146 | } | 146 | } |
147 | 147 | ||
@@ -150,7 +150,7 @@ void ZipInstaller::downloadDone(bool error) | |||
150 | m_dp->addItem(tr("Extracting failed: %1.") | 150 | m_dp->addItem(tr("Extracting failed: %1.") |
151 | .arg(uz.formatError(ec)),LOGERROR); | 151 | .arg(uz.formatError(ec)),LOGERROR); |
152 | m_dp->abort(); | 152 | m_dp->abort(); |
153 | emit done(false); | 153 | emit done(true); |
154 | return; | 154 | return; |
155 | } | 155 | } |
156 | // prepare file list for log | 156 | // prepare file list for log |
@@ -171,7 +171,7 @@ void ZipInstaller::downloadDone(bool error) | |||
171 | if(!downloadFile->copy(m_mountpoint + m_target)) { | 171 | if(!downloadFile->copy(m_mountpoint + m_target)) { |
172 | m_dp->addItem(tr("Installing file failed."), LOGERROR); | 172 | m_dp->addItem(tr("Installing file failed."), LOGERROR); |
173 | m_dp->abort(); | 173 | m_dp->abort(); |
174 | emit done(false); | 174 | emit done(true); |
175 | return; | 175 | return; |
176 | } | 176 | } |
177 | 177 | ||