From ab588b741e0c349e667210a110780d028f0abd8e Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 1 Sep 2007 22:57:50 +0000 Subject: [PATCH] Paused torrents could be displayed as connected for a sec after checking --- TODO | 1 + src/FinishedTorrents.cpp | 10 ++++++---- src/downloadingTorrents.cpp | 10 ++++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/TODO b/TODO index 4a59250d3..b7b59c5a7 100644 --- a/TODO +++ b/TODO @@ -77,3 +77,4 @@ LANGUAGES UPDATED: beta6->beta7 changelog: - FEATURE: Made search engine plugin install more reliable - BUGFIX: Updated man page / README / INSTALL +- BUGFIX: Paused torrents could be displayed as connected for a sec after checking diff --git a/src/FinishedTorrents.cpp b/src/FinishedTorrents.cpp index 1897a33ff..e0bd91285 100644 --- a/src/FinishedTorrents.cpp +++ b/src/FinishedTorrents.cpp @@ -209,6 +209,10 @@ void FinishedTorrents::updateFinishedList(){ } Q_ASSERT(row != -1); if(h.is_paused()) continue; + if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) { + finishedListModel->setData(finishedListModel->index(row, F_PROGRESS), QVariant((double)h.progress())); + continue; + } if(h.state() == torrent_status::downloading || (h.state() != torrent_status::checking_files && h.state() != torrent_status::queued_for_checking && h.progress() < 1.)) { // What are you doing here? go back to download tab! qDebug("Info: a torrent was moved from finished to download tab"); @@ -218,10 +222,8 @@ void FinishedTorrents::updateFinishedList(){ continue; } if(h.state() == torrent_status::checking_files){ - if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) == -1) { - finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole); - setRowColor(row, QString::fromUtf8("grey")); - } + finishedListModel->setData(finishedListModel->index(row, F_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole); + setRowColor(row, QString::fromUtf8("grey")); finishedListModel->setData(finishedListModel->index(row, F_PROGRESS), QVariant((double)h.progress())); continue; } diff --git a/src/downloadingTorrents.cpp b/src/downloadingTorrents.cpp index 14c166795..4ee96a3de 100644 --- a/src/downloadingTorrents.cpp +++ b/src/downloadingTorrents.cpp @@ -372,6 +372,10 @@ void DownloadingTorrents::updateDlList() { Q_ASSERT(row != -1); // No need to update a paused torrent if(h.is_paused()) continue; + if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) != -1) { + DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress())); + continue; + } // Parse download state // Setting download state switch(h.state()) { @@ -384,10 +388,8 @@ void DownloadingTorrents::updateDlList() { continue; case torrent_status::checking_files: case torrent_status::queued_for_checking: - if(BTSession->getTorrentsToPauseAfterChecking().indexOf(hash) == -1) { - DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole); - setRowColor(row, QString::fromUtf8("grey")); - } + DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/time.png"))), Qt::DecorationRole); + setRowColor(row, QString::fromUtf8("grey")); DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress())); break; case torrent_status::connecting_to_tracker: