d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 07:18:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3395 from ngosang/content_percent

Browse Source 
Fix progress calculation in Content tab. Closes #2639 Closes #2752
This commit is contained in:
sledgehammer999 2015-07-12 15:42:46 +03:00
commit d4151c1832
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/torrentcontentmodelfolder.cpp
View File

@ -136,19 +136,19 @@ void TorrentContentModelFolder::setPriority(int new_prio, bool update_parent)
void TorrentContentModelFolder::recalculateProgress() void TorrentContentModelFolder::recalculateProgress()
{ {
qreal progress = 0; qreal tProgress = 0;
int count = 0; qulonglong tSize = 0;
foreach (TorrentContentModelItem* child, m_childItems) { foreach (TorrentContentModelItem* child, m_childItems) {
if (child->priority() != prio::IGNORED) { if (child->priority() != prio::IGNORED) {
if (child->itemType() == FolderType) if (child->itemType() == FolderType)
static_cast<TorrentContentModelFolder*>(child)->recalculateProgress(); static_cast<TorrentContentModelFolder*>(child)->recalculateProgress();
progress += child->progress(); tProgress += child->progress() * child->size();
++count; tSize += child->size();
} }
} }
if (!isRootItem() && (count > 0)) { if (!isRootItem() && tSize > 0) {
m_progress = progress / count; m_progress = tProgress / tSize;
Q_ASSERT(m_progress <= 1.); Q_ASSERT(m_progress <= 1.);
} }
} }