mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 10:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #16009 from glassez/dont-move-into-itself

Browse source 
Don't try to move storage into its current location
This commit is contained in:
Vladimir Golovnev 2022-01-11 07:26:22 +03:00 committed by GitHub
commit 709a053c7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/base/bittorrent/torrentimpl.cpp
View file

@ -411,7 +411,7 @@ void TorrentImpl::setSavePath(const QString &path)
m_session->handleTorrentNeedSaveResumeData(this); m_session->handleTorrentNeedSaveResumeData(this);
const bool isFinished = isSeed() || m_hasSeedStatus; const bool isFinished = isSeed() || m_hasSeedStatus;
if (isFinished) if (isFinished || downloadPath().isEmpty())
moveStorage(savePath(), MoveStorageMode::KeepExistingFiles); moveStorage(savePath(), MoveStorageMode::KeepExistingFiles);
} }
@ -2074,7 +2074,8 @@ void TorrentImpl::adjustStorageLocation()
const bool isFinished = isSeed() || m_hasSeedStatus; const bool isFinished = isSeed() || m_hasSeedStatus;
const QDir targetDir {((isFinished || downloadPath.isEmpty()) ? savePath() : downloadPath)}; const QDir targetDir {((isFinished || downloadPath.isEmpty()) ? savePath() : downloadPath)};
moveStorage(targetDir.absolutePath(), MoveStorageMode::Overwrite); if ((targetDir != QDir(actualStorageLocation())) || isMoveInProgress())
moveStorage(targetDir.absolutePath(), MoveStorageMode::Overwrite);
} }
lt::torrent_handle TorrentImpl::nativeHandle() const lt::torrent_handle TorrentImpl::nativeHandle() const