summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Pinkham <cpinkham@mythtv.org>2011-01-28 04:49:39 (GMT)
committer Chris Pinkham <cpinkham@mythtv.org>2011-01-28 07:18:26 (GMT)
commitb6dbb3ed1a11bcc4a49c6dde758e5a1e0235fc0d (patch)
tree07be585b399929578426c6e7f6f6167d6c4286ff
parent95ecfdbd17c0f7b99244b2cf59baa3af96371a4e (diff)
A couple bugfixes in MythDownloadManager.
Hook up downloadProgress and error signals when we are redirected and have to download a different URL. Fill in a missing arg() for a VERBOSE debug statement. (cherry picked from commit dbbf254388b11657bc26ab0a753991e992416405)
-rw-r--r--mythtv/libs/libmythdb/mythdownloadmanager.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/mythtv/libs/libmythdb/mythdownloadmanager.cpp b/mythtv/libs/libmythdb/mythdownloadmanager.cpp
index 8b765e7..22a8274 100644
--- a/mythtv/libs/libmythdb/mythdownloadmanager.cpp
+++ b/mythtv/libs/libmythdb/mythdownloadmanager.cpp
@@ -778,6 +778,11 @@ void MythDownloadManager::downloadFinished(MythDownloadInfo *dlInfo)
m_downloadReplies[dlInfo->m_reply] = dlInfo;
+ connect(dlInfo->m_reply, SIGNAL(error(QNetworkReply::NetworkError)), this,
+ SLOT(downloadError(QNetworkReply::NetworkError)));
+ connect(dlInfo->m_reply, SIGNAL(downloadProgress(qint64, qint64)),
+ this, SLOT(downloadProgress(qint64, qint64)));
+
m_downloadReplies.remove(reply);
reply->deleteLater();
}
@@ -845,7 +850,7 @@ void MythDownloadManager::downloadFinished(MythDownloadInfo *dlInfo)
{
VERBOSE(VB_FILE+VB_EXTRA, QString("downloadFinished(%1): "
"COMPLETE: %2, sending event to caller")
- .arg(dlInfo->m_url));
+ .arg((long long)dlInfo).arg(dlInfo->m_url));
QStringList args;
args << dlInfo->m_url;