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

Fix last activity calculation. Closes #7461

Browse Source 
`time_since_upload` & `time_since_download` can be -1, so filter them out
This commit is contained in:
Chocobo1 2017-09-22 12:42:24 +08:00
parent 83c6b22d30
commit 62493c672d
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/base/bittorrent/torrenthandle.cpp
View File

@ -27,6 +27,7 @@
* exception statement from your version.
*/
#include <algorithm>
#include <type_traits>
#include <QDebug>
@ -1108,10 +1109,9 @@ int TorrentHandle::timeSinceDownload() const
int TorrentHandle::timeSinceActivity() const
{
if (m_nativeStatus.time_since_upload < m_nativeStatus.time_since_download)
return m_nativeStatus.time_since_upload;
else
return m_nativeStatus.time_since_download;
return ((m_nativeStatus.time_since_upload < 0) != (m_nativeStatus.time_since_download < 0))
? std::max(m_nativeStatus.time_since_upload, m_nativeStatus.time_since_download)
: std::min(m_nativeStatus.time_since_upload, m_nativeStatus.time_since_download);
}
int TorrentHandle::downloadLimit() const

12
src/gui/transferlistdelegate.cpp
View File

@ -181,14 +181,14 @@ void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem
if (hideValues && ((elapsed < 0) || (elapsed >= MAX_ETA)))
break;
QString elapsedString;
// Show '< 1m ago' when elapsed time is 0
if (elapsed == 0)
// Show '< 1m ago' when elapsed time is 0
elapsed = 1;
else if (elapsed < 0)
elapsedString = Utils::Misc::userFriendlyDuration(elapsed);
else
elapsedString = tr("%1 ago", "e.g.: 1h 20m ago").arg(Utils::Misc::userFriendlyDuration(elapsed));
QString elapsedString = (elapsed >= 0)
? tr("%1 ago", "e.g.: 1h 20m ago").arg(Utils::Misc::userFriendlyDuration(elapsed))
: Utils::Misc::userFriendlyDuration(elapsed);
opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
QItemDelegate::drawDisplay(painter, opt, option.rect, elapsedString);
break;