summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-03-21 21:04:24 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-03-21 21:04:24 +0000
commite8f25d91e8d89b3acc96aad3a81b684ea71443a8 (patch)
treef136d6d4b28afdc2b7ae75c28df92c29157d25fa /rbutil/rbutilqt/base
parente70f24c7d7df980226bd60cd31ef913a83cc5aa8 (diff)
downloadrockbox-e8f25d91e8d89b3acc96aad3a81b684ea71443a8.tar.gz
rockbox-e8f25d91e8d89b3acc96aad3a81b684ea71443a8.zip
Don't ignore errors when finishing a HTTP request for cached request as that is already done. Fixes a wrong status reported when an error occured.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20435 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r--rbutil/rbutilqt/base/httpget.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/base/httpget.cpp b/rbutil/rbutilqt/base/httpget.cpp
index bd15de41a9..5aabc5b29c 100644
--- a/rbutil/rbutilqt/base/httpget.cpp
+++ b/rbutil/rbutilqt/base/httpget.cpp
@@ -255,7 +255,7 @@ void HttpGet::getFileFinish()
255 } 255 }
256 m_response = 200; // fake "200 OK" HTTP response 256 m_response = 200; // fake "200 OK" HTTP response
257 m_cached = true; 257 m_cached = true;
258 httpDone(false); // we're done now. Fake http "done" signal. 258 httpDone(false); // we're done now. Handle http "done" signal.
259 return; 259 return;
260 } 260 }
261 else { 261 else {
@@ -313,10 +313,6 @@ void HttpGet::httpDone(bool error)
313 313
314 c.close(); 314 c.close();
315 } 315 }
316 // if cached file found and cache enabled ignore http errors
317 if(m_usecache && m_cached && !http.hasPendingRequests()) {
318 error = false;
319 }
320 // take care of concurring requests. If there is still one running, 316 // take care of concurring requests. If there is still one running,
321 // don't emit done(). That request will call this slot again. 317 // don't emit done(). That request will call this slot again.
322 if(http.currentId() == 0 && !http.hasPendingRequests()) 318 if(http.currentId() == 0 && !http.hasPendingRequests())