mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2025-12-21 07:57:22 -06:00
Revert changes of conflict resolution strategy on automatic move
PR #18516. Closes #18297. Closes #18495.
This commit is contained in:
committed by
GitHub
parent
0dcbf9f698
commit
7227d2b2b2
@@ -2201,7 +2201,7 @@ void TorrentImpl::adjustStorageLocation()
|
|||||||
const Path targetPath = ((isFinished || downloadPath.isEmpty()) ? savePath() : downloadPath);
|
const Path targetPath = ((isFinished || downloadPath.isEmpty()) ? savePath() : downloadPath);
|
||||||
|
|
||||||
if ((targetPath != actualStorageLocation()) || isMoveInProgress())
|
if ((targetPath != actualStorageLocation()) || isMoveInProgress())
|
||||||
moveStorage(targetPath, MoveStorageMode::FailIfExist);
|
moveStorage(targetPath, MoveStorageMode::Overwrite);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TorrentImpl::doRenameFile(int index, const Path &path)
|
void TorrentImpl::doRenameFile(int index, const Path &path)
|
||||||
|
|||||||
Reference in New Issue
Block a user