mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-21 08:09:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't resume "paused" torrents when checking by libtorrent

Browse Source
This commit is contained in:
Vladimir Golovnev (Glassez) 2020-10-26 11:08:22 +03:00
parent cf55b67cee
commit 9f0edde12b
No known key found for this signature in database
GPG Key ID: 52A2C7DEE2DFA6F7
3 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/base/bittorrent/nativetorrentextension.cpp
View File

@ -49,17 +49,6 @@ NativeTorrentExtension::NativeTorrentExtension(const lt::torrent_handle &torrent
{
}
// This method is called when state of torrent is changed
void NativeTorrentExtension::on_state(const lt::torrent_status::state_t state)
{
// When a torrent enters "checking files" state while paused, we temporarily resume it
// (really we just allow libtorrent to resume it by enabling auto management for it).
if (state == lt::torrent_status::checking_files) {
if (isPaused(m_torrentHandle.status({})))
m_torrentHandle.set_flags(lt::torrent_flags::stop_when_ready | lt::torrent_flags::auto_managed);
}
}
bool NativeTorrentExtension::on_pause()
{
if (!isAutoManaged(m_torrentHandle.status({})))

1
src/base/bittorrent/nativetorrentextension.h
View File

@ -37,7 +37,6 @@ public:
explicit NativeTorrentExtension(const lt::torrent_handle &torrentHandle);
private:
void on_state(lt::torrent_status::state_t state) override;
bool on_pause() override;
lt::torrent_handle m_torrentHandle;

17
src/base/bittorrent/torrenthandleimpl.cpp
View File

@ -1194,6 +1194,12 @@ void TorrentHandleImpl::forceRecheck()
m_nativeHandle.force_recheck();
m_unchecked = false;
if (isPaused()) {
// When "force recheck" is applied on paused torrent, we temporarily resume it
// (really we just allow libtorrent to resume it by enabling auto management for it).
m_nativeHandle.set_flags(lt::torrent_flags::stop_when_ready | lt::torrent_flags::auto_managed);
}
}
void TorrentHandleImpl::setSequentialDownload(const bool enable)
@ -1449,17 +1455,6 @@ void TorrentHandleImpl::handleSaveResumeDataAlert(const lt::save_resume_data_ale
m_ltAddTorrentParams.added_time = addedTime().toSecsSinceEpoch();
m_ltAddTorrentParams.save_path = Profile::instance()->toPortablePath(
QString::fromStdString(m_ltAddTorrentParams.save_path)).toStdString();
if (!m_hasMissingFiles) {
m_ltAddTorrentParams.flags = m_nativeStatus.flags;
if (m_nativeStatus.flags & lt::torrent_flags::stop_when_ready) {
// We need to redefine these values when torrent starting/rechecking
// in "paused" state since native values can be logically wrong
// (torrent can be not paused and auto_managed when it is checking).
m_ltAddTorrentParams.flags |= lt::torrent_flags::paused;
m_ltAddTorrentParams.flags &= ~lt::torrent_flags::auto_managed;
m_ltAddTorrentParams.flags &= ~lt::torrent_flags::stop_when_ready;
}
}
auto resumeDataPtr = std::make_shared<lt::entry>(lt::write_resume_data(m_ltAddTorrentParams));
lt::entry &resumeData = *resumeDataPtr;