Browse Source

Merge pull request #14353 from glassez/rename

Allow change-case-only file renaming on Windows
adaptive-webui-19844
Vladimir Golovnev 4 years ago committed by GitHub
parent
commit
dd65f35e5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/base/bittorrent/abstractfilestorage.cpp

6
src/base/bittorrent/abstractfilestorage.cpp

@ -78,8 +78,7 @@ void BitTorrent::AbstractFileStorage::renameFile(const QString &oldPath, const Q
if ((renamingFileIndex < 0) && areSameFileNames(path, oldFilePath)) if ((renamingFileIndex < 0) && areSameFileNames(path, oldFilePath))
renamingFileIndex = i; renamingFileIndex = i;
else if (areSameFileNames(path, newFilePath))
if (areSameFileNames(path, newFilePath))
throw RuntimeError {tr("The file already exists: '%1'.").arg(newFilePath)}; throw RuntimeError {tr("The file already exists: '%1'.").arg(newFilePath)};
} }
@ -124,8 +123,7 @@ void BitTorrent::AbstractFileStorage::renameFolder(const QString &oldPath, const
if (path.startsWith(oldFolderPath, CASE_SENSITIVITY)) if (path.startsWith(oldFolderPath, CASE_SENSITIVITY))
renamingFileIndexes.append(i); renamingFileIndexes.append(i);
else if (path.startsWith(newFolderPath, CASE_SENSITIVITY))
if (path.startsWith(newFolderPath, CASE_SENSITIVITY))
throw RuntimeError {tr("The folder already exists: '%1'.").arg(newFolderPath)}; throw RuntimeError {tr("The folder already exists: '%1'.").arg(newFolderPath)};
} }

Loading…
Cancel
Save