diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 7105ef98a..0f7b923a2 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -331,8 +331,7 @@ if (numberSelected == 0) return; - float downloadedValid = 0; - uint64_t downloadedTotal = 0, uploadedTotal = 0; + uint64_t downloadedValid = 0, downloadedTotal = 0, uploadedTotal = 0; Torrent * torrent; NSEnumerator * enumerator = [fTorrents objectEnumerator]; while ((torrent = [enumerator nextObject])) diff --git a/macosx/Torrent.h b/macosx/Torrent.h index dc86c0f60..ab8ad04ba 100644 --- a/macosx/Torrent.h +++ b/macosx/Torrent.h @@ -176,7 +176,7 @@ - (float) downloadRate; - (float) uploadRate; -- (float) downloadedValid; +- (uint64_t) downloadedValid; - (uint64_t) downloadedTotal; - (uint64_t) uploadedTotal; - (float) swarmSpeed; diff --git a/macosx/Torrent.m b/macosx/Torrent.m index b3535caf9..8c53d152b 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -1081,9 +1081,9 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 return fStat->rateUpload; } -- (float) downloadedValid +- (uint64_t) downloadedValid { - return [self progress] * [self size]; + return fInfo->totalSize - fStat->left; } - (uint64_t) downloadedTotal