mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-18 06:01:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix stuck in wrong torrent state

Browse source 
Before this patch, adding the torrent in
https://github.com/qbittorrent/qBittorrent/issues/11511 and the torrrent
state will stay in torrent_status::checking_resume_data forever.
This is not the correct state since the `torrent_status.errc` field is
non-zero and this commit fixes it.
This commit is contained in:
Chocobo1 2019-11-25 21:37:32 +08:00
parent 7ff8545f55
commit 2ca70cf6cc
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/base/bittorrent/session.cpp
View file

@ -4188,6 +4188,10 @@ void Session::createTorrentHandle(const lt::torrent_handle &nativeHandle)
// Send new torrent signal // Send new torrent signal
if (!params.restored) if (!params.restored)
emit torrentNew(torrent); emit torrentNew(torrent);
// Torrent could have error just after adding to libtorrent
if (torrent->hasError())
LogMsg(tr("Torrent errored. Torrent: \"%1\". Error: %2.").arg(torrent->name(), torrent->error()), Log::WARNING);
} }
void Session::handleAddTorrentAlert(const lt::add_torrent_alert *p) void Session::handleAddTorrentAlert(const lt::add_torrent_alert *p)

14
src/base/bittorrent/torrenthandle.cpp
View file

@ -899,7 +899,10 @@ TorrentState TorrentHandle::state() const
void TorrentHandle::updateState() void TorrentHandle::updateState()
{ {
if (m_nativeStatus.state == lt::torrent_status::checking_resume_data) { if (hasError()) {
m_state = TorrentState::Error;
}
else if (m_nativeStatus.state == lt::torrent_status::checking_resume_data) {
m_state = TorrentState::CheckingResumeData; m_state = TorrentState::CheckingResumeData;
} }
else if (isMoveInProgress()) { else if (isMoveInProgress()) {
@ -908,8 +911,6 @@ void TorrentHandle::updateState()
else if (isPaused()) { else if (isPaused()) {
if (hasMissingFiles()) if (hasMissingFiles())
m_state = TorrentState::MissingFiles; m_state = TorrentState::MissingFiles;
else if (hasError())
m_state = TorrentState::Error;
else else
m_state = isSeed() ? TorrentState::PausedUploading : TorrentState::PausedDownloading; m_state = isSeed() ? TorrentState::PausedUploading : TorrentState::PausedDownloading;
} }
@ -961,12 +962,7 @@ bool TorrentHandle::hasMissingFiles() const
bool TorrentHandle::hasError() const bool TorrentHandle::hasError() const
{ {
#if (LIBTORRENT_VERSION_NUM < 10200) return static_cast<bool>(m_nativeStatus.errc);
return (m_nativeStatus.paused && m_nativeStatus.errc);
#else
return ((m_nativeStatus.flags & lt::torrent_flags::paused)
&& m_nativeStatus.errc);
#endif
} }
bool TorrentHandle::hasFilteredPieces() const bool TorrentHandle::hasFilteredPieces() const