From 5d2663660dfe1b00bd7f20a1cac9adfef8dff7ba Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Thu, 15 May 2014 21:59:39 +0300 Subject: [PATCH] Count magnet links in the 'downloading' filter and make them prevent system inhibition. Closes #1558 --- src/qtlibtorrent/torrentmodel.cpp | 4 ++++ src/transferlistwidget.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qtlibtorrent/torrentmodel.cpp b/src/qtlibtorrent/torrentmodel.cpp index 1ae26cd5f..58df2e413 100644 --- a/src/qtlibtorrent/torrentmodel.cpp +++ b/src/qtlibtorrent/torrentmodel.cpp @@ -428,6 +428,9 @@ TorrentStatusReport TorrentModel::getTorrentStatusReport() const ++report.nb_active; ++report.nb_downloading; break; + case TorrentModelItem::STATE_DOWNLOADING_META: + ++report.nb_downloading; + break; case TorrentModelItem::STATE_PAUSED_DL: ++report.nb_paused; case TorrentModelItem::STATE_STALLED_DL: @@ -492,6 +495,7 @@ bool TorrentModel::inhibitSystem() for ( ; it != itend; ++it) { switch((*it)->data(TorrentModelItem::TR_STATUS).toInt()) { case TorrentModelItem::STATE_DOWNLOADING: + case TorrentModelItem::STATE_DOWNLOADING_META: case TorrentModelItem::STATE_STALLED_DL: case TorrentModelItem::STATE_SEEDING: case TorrentModelItem::STATE_STALLED_UP: diff --git a/src/transferlistwidget.cpp b/src/transferlistwidget.cpp index 44dcc81e4..fdff70368 100644 --- a/src/transferlistwidget.cpp +++ b/src/transferlistwidget.cpp @@ -921,7 +921,7 @@ void TransferListWidget::applyStatusFilter(int f) { case FILTER_DOWNLOADING: statusFilterModel->setFilterRegExp(QRegExp(QString::number(TorrentModelItem::STATE_DOWNLOADING)+"|"+QString::number(TorrentModelItem::STATE_STALLED_DL)+"|"+ QString::number(TorrentModelItem::STATE_PAUSED_DL)+"|"+QString::number(TorrentModelItem::STATE_CHECKING_DL)+"|"+ - QString::number(TorrentModelItem::STATE_QUEUED_DL), Qt::CaseSensitive)); + QString::number(TorrentModelItem::STATE_QUEUED_DL)+"|"+QString::number(TorrentModelItem::STATE_DOWNLOADING_META), Qt::CaseSensitive)); break; case FILTER_COMPLETED: statusFilterModel->setFilterRegExp(QRegExp(QString::number(TorrentModelItem::STATE_SEEDING)+"|"+QString::number(TorrentModelItem::STATE_STALLED_UP)+"|"+