summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/zipinstaller.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/zipinstaller.cpp')
-rw-r--r--rbutil/rbutilqt/zipinstaller.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/rbutil/rbutilqt/zipinstaller.cpp b/rbutil/rbutilqt/zipinstaller.cpp
index 9723e10e69..deff52768a 100644
--- a/rbutil/rbutilqt/zipinstaller.cpp
+++ b/rbutil/rbutilqt/zipinstaller.cpp
@@ -59,7 +59,7 @@ void ZipInstaller::installContinue()
59 } 59 }
60 else { 60 else {
61 m_dp->addItem(tr("Installation finished successfully."),LOGOK); 61 m_dp->addItem(tr("Installation finished successfully."),LOGOK);
62 m_dp->abort(); 62 m_dp->setFinished();
63 63
64 emit done(false); 64 emit done(false);
65 return; 65 return;
@@ -112,14 +112,14 @@ void ZipInstaller::downloadDone(bool error)
112 m_dp->setProgressValue(max); 112 m_dp->setProgressValue(max);
113 if(getter->httpResponse() != 200 && !getter->isCached()) { 113 if(getter->httpResponse() != 200 && !getter->isCached()) {
114 m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); 114 m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR);
115 m_dp->abort(); 115 m_dp->setFinished();
116 emit done(true); 116 emit done(true);
117 return; 117 return;
118 } 118 }
119 if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO); 119 if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO);
120 if(error) { 120 if(error) {
121 m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); 121 m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR);
122 m_dp->abort(); 122 m_dp->setFinished();
123 emit done(true); 123 emit done(true);
124 return; 124 return;
125 } 125 }
@@ -143,7 +143,7 @@ void ZipInstaller::downloadDone(bool error)
143 .arg(uz.formatError(ec)),LOGERROR); 143 .arg(uz.formatError(ec)),LOGERROR);
144 m_dp->setProgressMax(1); 144 m_dp->setProgressMax(1);
145 m_dp->setProgressValue(1); 145 m_dp->setProgressValue(1);
146 m_dp->abort(); 146 m_dp->setFinished();
147 emit done(true); 147 emit done(true);
148 return; 148 return;
149 } 149 }
@@ -153,7 +153,7 @@ void ZipInstaller::downloadDone(bool error)
153 // cluster sizes on the player). 153 // cluster sizes on the player).
154 if(filesystemFree(m_mountpoint) < (uz.totalSize() + 1000000)) { 154 if(filesystemFree(m_mountpoint) < (uz.totalSize() + 1000000)) {
155 m_dp->addItem(tr("Not enough disk space! Aborting."), LOGERROR); 155 m_dp->addItem(tr("Not enough disk space! Aborting."), LOGERROR);
156 m_dp->abort(); 156 m_dp->setFinished();
157 m_dp->setProgressMax(1); 157 m_dp->setProgressMax(1);
158 m_dp->setProgressValue(1); 158 m_dp->setProgressValue(1);
159 emit done(true); 159 emit done(true);
@@ -164,7 +164,7 @@ void ZipInstaller::downloadDone(bool error)
164 if(ec != UnZip::Ok) { 164 if(ec != UnZip::Ok) {
165 m_dp->addItem(tr("Extracting failed: %1.") 165 m_dp->addItem(tr("Extracting failed: %1.")
166 .arg(uz.formatError(ec)),LOGERROR); 166 .arg(uz.formatError(ec)),LOGERROR);
167 m_dp->abort(); 167 m_dp->setFinished();
168 m_dp->setProgressMax(1); 168 m_dp->setProgressMax(1);
169 m_dp->setProgressValue(1); 169 m_dp->setProgressValue(1);
170 170
@@ -188,7 +188,7 @@ void ZipInstaller::downloadDone(bool error)
188 QFile(m_mountpoint + m_target).remove(); 188 QFile(m_mountpoint + m_target).remove();
189 if(!downloadFile->copy(m_mountpoint + m_target)) { 189 if(!downloadFile->copy(m_mountpoint + m_target)) {
190 m_dp->addItem(tr("Installing file failed."), LOGERROR); 190 m_dp->addItem(tr("Installing file failed."), LOGERROR);
191 m_dp->abort(); 191 m_dp->setFinished();
192 emit done(true); 192 emit done(true);
193 return; 193 return;
194 } 194 }