squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-31 12:48:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7480 from Chocobo1/lastAct

Browse Source 
Fix last activity calculation
This commit is contained in:
Mike Tzou
2017-09-26 15:17:35 +08:00
committed by GitHub
parent c285de87d4 62493c672d
commit 1fe9272a8f
2 changed files with 10 additions and 10 deletions
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