d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

- improved some asserts for progress checking

adaptive-webui-19844
Christophe Dumez 17 years ago
parent
7030f85826
commit
2bf0aba48a
2 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/FinishedTorrents.cpp
  2. 8
      src/GUI.cpp

2
src/FinishedTorrents.cpp
Unescape View File

@ -173,7 +173,7 @@ void FinishedTorrents::updateFinishedList(){
continue; continue;
} }
if(h.is_paused()) continue; if(h.is_paused()) continue;
Q_ASSERT(torrentStatus.progress <= 1.); Q_ASSERT(torrentStatus.progress <= 1. && torrentStatus.progress >= 0.);
if(torrentStatus.state == torrent_status::downloading || (torrentStatus.state != torrent_status::checking_files && torrentStatus.state != torrent_status::queued_for_checking && torrentStatus.progress < 1.)) { if(torrentStatus.state == torrent_status::downloading || (torrentStatus.state != torrent_status::checking_files && torrentStatus.state != torrent_status::queued_for_checking && torrentStatus.progress < 1.)) {
// What are you doing here? go back to download tab! // What are you doing here? go back to download tab!
qDebug("Info: a torrent was moved from finished to download tab"); qDebug("Info: a torrent was moved from finished to download tab");

8
src/GUI.cpp
Unescape View File

@ -578,7 +578,7 @@ void GUI::updateDlList(bool force){
if(BTSession->getTorrentsToPauseAfterChecking().indexOf(fileHash) == -1){ if(BTSession->getTorrentsToPauseAfterChecking().indexOf(fileHash) == -1){
DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(":/Icons/time.png")), Qt::DecorationRole); DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(":/Icons/time.png")), Qt::DecorationRole);
setRowColor(row, "grey"); setRowColor(row, "grey");
Q_ASSERT(torrentStatus.progress <= 1.); Q_ASSERT(torrentStatus.progress <= 1. && torrentStatus.progress >= 0.);
DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)torrentStatus.progress)); DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)torrentStatus.progress));
} }
break; break;
@ -593,7 +593,7 @@ void GUI::updateDlList(bool force){
DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(":/Icons/skin/connecting.png")), Qt::DecorationRole); DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(":/Icons/skin/connecting.png")), Qt::DecorationRole);
setRowColor(row, "grey"); setRowColor(row, "grey");
} }
Q_ASSERT(torrentStatus.progress <= 1.); Q_ASSERT(torrentStatus.progress <= 1. && torrentStatus.progress >= 0.);
DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)torrentStatus.progress)); DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)torrentStatus.progress));
DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)torrentStatus.download_payload_rate)); DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)torrentStatus.download_payload_rate));
DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)torrentStatus.upload_payload_rate)); DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)torrentStatus.upload_payload_rate));
@ -610,7 +610,7 @@ void GUI::updateDlList(bool force){
DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1)); DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1));
setRowColor(row, "black"); setRowColor(row, "black");
} }
Q_ASSERT(torrentStatus.progress <= 1.); Q_ASSERT(torrentStatus.progress <= 1. && torrentStatus.progress >= 0.);
DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)torrentStatus.progress)); DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)torrentStatus.progress));
DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)torrentStatus.download_payload_rate)); DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)torrentStatus.download_payload_rate));
DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)torrentStatus.upload_payload_rate)); DLListModel->setData(DLListModel->index(row, UPSPEED), QVariant((double)torrentStatus.upload_payload_rate));
@ -1633,7 +1633,7 @@ void GUI::torrentChecked(QString hash){
DLListModel->setData(DLListModel->index(row, NAME), QIcon(":/Icons/skin/paused.png"), Qt::DecorationRole); DLListModel->setData(DLListModel->index(row, NAME), QIcon(":/Icons/skin/paused.png"), Qt::DecorationRole);
setRowColor(row, "red"); setRowColor(row, "red");
// Update progress in download list // Update progress in download list
Q_ASSERT(torrentStatus.progress <= 1.); Q_ASSERT(torrentStatus.progress <= 1. && torrentStatus.progress >= 0.);
DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)torrentStatus.progress)); DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)torrentStatus.progress));
// Delayed Sorting // Delayed Sorting
sortProgressColumnDelayed(); sortProgressColumnDelayed();

Write Preview
Loading…
Cancel
Save