From 7227d2b2b253b395f8cf51b64e282b3f49fc7ca2 Mon Sep 17 00:00:00 2001 From: Vladimir Golovnev Date: Sun, 5 Feb 2023 09:29:43 +0300 Subject: [PATCH] Revert changes of conflict resolution strategy on automatic move PR #18516. Closes #18297. Closes #18495. --- src/base/bittorrent/torrentimpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/bittorrent/torrentimpl.cpp b/src/base/bittorrent/torrentimpl.cpp index 6c654645f..29a564751 100644 --- a/src/base/bittorrent/torrentimpl.cpp +++ b/src/base/bittorrent/torrentimpl.cpp @@ -2201,7 +2201,7 @@ void TorrentImpl::adjustStorageLocation() const Path targetPath = ((isFinished || downloadPath.isEmpty()) ? savePath() : downloadPath); if ((targetPath != actualStorageLocation()) || isMoveInProgress()) - moveStorage(targetPath, MoveStorageMode::FailIfExist); + moveStorage(targetPath, MoveStorageMode::Overwrite); } void TorrentImpl::doRenameFile(int index, const Path &path)