diff --git a/coding/coding_tests/file_data_test.cpp b/coding/coding_tests/file_data_test.cpp index 85b0bcd272..039345cf71 100644 --- a/coding/coding_tests/file_data_test.cpp +++ b/coding/coding_tests/file_data_test.cpp @@ -95,7 +95,7 @@ UNIT_TEST(FileData_SharingAV_Windows) // try rename or copy to locked file TEST(!my::RenameFileX(name2, name1), ()); - TEST(!my::CopyFile(name2, name1), ()); + TEST(!my::CopyFileX(name2, name1), ()); // files should be unchanged CheckFileOK(name1); diff --git a/coding/internal/file_data.cpp b/coding/internal/file_data.cpp index 4ebbf3eecc..5582b4f099 100644 --- a/coding/internal/file_data.cpp +++ b/coding/internal/file_data.cpp @@ -232,7 +232,7 @@ bool RenameFileX(string const & fOld, string const & fNew) return CheckRemoveResult(res, fOld); } -bool CopyFile(string const & fOld, string const & fNew) +bool CopyFileX(string const & fOld, string const & fNew) { try { diff --git a/coding/internal/file_data.hpp b/coding/internal/file_data.hpp index 5e01825312..f8e6ac336b 100644 --- a/coding/internal/file_data.hpp +++ b/coding/internal/file_data.hpp @@ -47,7 +47,7 @@ bool GetFileSize(string const & fName, uint64_t & sz); bool DeleteFileX(string const & fName); bool RenameFileX(string const & fOld, string const & fNew); /// @return false if copy fails. DO NOT THROWS exceptions -bool CopyFile(string const & fOld, string const & fNew); +bool CopyFileX(string const & fOld, string const & fNew); bool IsEqualFiles(string const & firstFile, string const & secondFile); } diff --git a/map/framework.cpp b/map/framework.cpp index 16d5bff5f5..b058cfaf73 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -618,7 +618,7 @@ bool Framework::AddBookmarksFile(string const & filePath) if (fileExt == KML_EXTENSION) { fileSavePath = GenerateValidandUniqFilePathForKLM( GetFileName(filePath) ); - if (!my::CopyFile(filePath, fileSavePath)) + if (!my::CopyFileX(filePath, fileSavePath)) return false; } else if (fileExt == KMZ_EXTENSION)