diff --git a/mythtv/libs/libmythbase/mythdownloadmanager.cpp b/mythtv/libs/libmythbase/mythdownloadmanager.cpp
index eba42b5..e7d6e7b 100644
|
a
|
b
|
bool MythDownloadManager::downloadNow(MythDownloadInfo *dlInfo, bool deleteInfo) |
| 797 | 797 | while ((!dlInfo->m_done) && |
| 798 | 798 | (dlInfo->m_errorCode == QNetworkReply::NoError) && |
| 799 | 799 | (((!dlInfo->m_url.startsWith("myth://")) && |
| 800 | | (dlInfo->m_lastStat.secsTo(QDateTime::currentDateTime()) < 10)) || |
| | 800 | (dlInfo->m_lastStat.secsTo(QDateTime::currentDateTime()) < 60)) || |
| 801 | 801 | ((dlInfo->m_url.startsWith("myth://")) && |
| 802 | 802 | (startedAt.secsTo(QDateTime::currentDateTime()) < 20)))) |
| 803 | 803 | { |
| … |
… |
bool MythDownloadManager::downloadNow(MythDownloadInfo *dlInfo, bool deleteInfo) |
| 817 | 817 | dlInfo->m_syncMode = false; // Let downloadFinished() cleanup for us |
| 818 | 818 | if ((dlInfo->m_reply) && |
| 819 | 819 | (dlInfo->m_errorCode == QNetworkReply::NoError)) |
| | 820 | { |
| | 821 | LOG(VB_FILE, LOG_DEBUG, |
| | 822 | LOC + QString("Aborting download - lack of data transfer")); |
| 820 | 823 | dlInfo->m_reply->abort(); |
| | 824 | } |
| 821 | 825 | } |
| 822 | 826 | else if (deleteInfo) |
| 823 | 827 | { |
| … |
… |
void MythDownloadManager::cancelDownload(const QString &url) |
| 847 | 851 | { |
| 848 | 852 | // this shouldn't happen |
| 849 | 853 | if (dlInfo->m_reply) |
| | 854 | { |
| | 855 | LOG(VB_FILE, LOG_DEBUG, |
| | 856 | LOC + QString("Aborting download - user request")); |
| 850 | 857 | dlInfo->m_reply->abort(); |
| | 858 | } |
| 851 | 859 | lit.remove(); |
| 852 | 860 | delete dlInfo; |
| 853 | 861 | dlInfo = NULL; |
| … |
… |
void MythDownloadManager::cancelDownload(const QString &url) |
| 859 | 867 | dlInfo = m_downloadInfos[url]; |
| 860 | 868 | if (dlInfo->m_reply) |
| 861 | 869 | { |
| | 870 | LOG(VB_FILE, LOG_DEBUG, |
| | 871 | LOC + QString("Aborting download - user request")); |
| 862 | 872 | m_downloadReplies.remove(dlInfo->m_reply); |
| 863 | 873 | dlInfo->m_reply->abort(); |
| 864 | 874 | } |