d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-05 11:24:15 +00:00
Code Issues Projects Releases Wiki Activity

Change torrent moving state when it is cancelled

Browse Source 
PR #16267.
This commit is contained in:
Vladimir Golovnev 2022-01-27 07:40:17 +03:00 committed by GitHub
parent adf7c4ffb6
commit ca9e5e8531
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/base/bittorrent/session.cpp
View File

@ -4033,7 +4033,7 @@ bool Session::addMoveTorrentStorageJob(TorrentImpl *torrent, const QString &newP
if (m_moveStorageQueue.size() > 1) if (m_moveStorageQueue.size() > 1)
{ {
const auto iter = std::find_if(m_moveStorageQueue.begin() + 1, m_moveStorageQueue.end() auto iter = std::find_if(m_moveStorageQueue.begin() + 1, m_moveStorageQueue.end()
, [&torrentHandle](const MoveStorageJob &job) , [&torrentHandle](const MoveStorageJob &job)
{ {
return job.torrentHandle == torrentHandle; return job.torrentHandle == torrentHandle;
@ -4042,8 +4042,16 @@ bool Session::addMoveTorrentStorageJob(TorrentImpl *torrent, const QString &newP
if (iter != m_moveStorageQueue.end()) if (iter != m_moveStorageQueue.end())
{ {
// remove existing inactive job // remove existing inactive job
m_moveStorageQueue.erase(iter);
LogMsg(tr("Cancelled moving \"%1\" from \"%2\" to \"%3\".").arg(torrent->name(), currentLocation, iter->path)); LogMsg(tr("Cancelled moving \"%1\" from \"%2\" to \"%3\".").arg(torrent->name(), currentLocation, iter->path));
iter = m_moveStorageQueue.erase(iter);
iter = std::find_if(iter, m_moveStorageQueue.end(), [&torrentHandle](const MoveStorageJob &job)
{
return job.torrentHandle == torrentHandle;
});
const bool torrentHasOutstandingJob = (iter != m_moveStorageQueue.end());
torrent->handleMoveStorageJobFinished(torrentHasOutstandingJob);
} }
} }