d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-12 15:57:57 +00:00
Code Issues Projects Releases Wiki Activity

Support 'file exists' situation

Browse Source 
The lt::status_t::file_exist is returned when lt::move_flags_t::fail_if_exist is used, which means the whole move operation failed. So hanlde this condition correctly (even if the fail_if_exist isn't used in the code base currently).

PR #17853.
This commit is contained in:
Chocobo1 2022-10-09 13:47:52 +08:00 committed by GitHub
parent 3463442631
commit 1f799689ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/base/bittorrent/customstorage.cpp
View File

@ -120,7 +120,7 @@ void CustomDiskIOThread::async_move_storage(lt::storage_index_t storage, std::st
m_nativeDiskIO->async_move_storage(storage, path, flags m_nativeDiskIO->async_move_storage(storage, path, flags
, [=, handler = std::move(handler)](lt::status_t status, const std::string &path, const lt::storage_error &error) , [=, handler = std::move(handler)](lt::status_t status, const std::string &path, const lt::storage_error &error)
{ {
if (status != lt::status_t::fatal_disk_error) if ((status != lt::status_t::fatal_disk_error) && (status != lt::status_t::file_exist))
m_storageData[storage].savePath = newSavePath; m_storageData[storage].savePath = newSavePath;
handler(status, path, error); handler(status, path, error);
@ -265,7 +265,7 @@ lt::status_t CustomStorage::move_storage(const std::string &savePath, lt::move_f
handleCompleteFiles(newSavePath); handleCompleteFiles(newSavePath);
const lt::status_t ret = lt::default_storage::move_storage(savePath, flags, ec); const lt::status_t ret = lt::default_storage::move_storage(savePath, flags, ec);
if (ret != lt::status_t::fatal_disk_error) if ((ret != lt::status_t::fatal_disk_error) && (ret != lt::status_t::file_exist))
m_savePath = newSavePath; m_savePath = newSavePath;
return ret; return ret;