From 35cd99a844c69b2b13b19f69e683cead52ef96dd Mon Sep 17 00:00:00 2001 From: Silent Date: Sat, 6 Mar 2021 18:37:10 +0100 Subject: [PATCH] CxbxFormatPartitionByHandle: Use non-throwing std::filesystem functions --- src/core/kernel/support/EmuFile.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/core/kernel/support/EmuFile.cpp b/src/core/kernel/support/EmuFile.cpp index 5a38061e9..b7bbb1446 100644 --- a/src/core/kernel/support/EmuFile.cpp +++ b/src/core/kernel/support/EmuFile.cpp @@ -175,17 +175,12 @@ void CxbxFormatPartitionByHandle(HANDLE hFile) // Format the partition, by iterating through the contents and removing all files/folders within // Previously, we deleted and re-created the folder, but that caused permission issues for some users - try - { - for (auto& directoryEntry : std::filesystem::directory_iterator(partitionPath)) { - std::filesystem::remove_all(directoryEntry); + std::error_code er; + for (const auto& directoryEntry : std::filesystem::directory_iterator(partitionPath, er)) { + if (!er) { + std::filesystem::remove_all(directoryEntry, er); } } - catch (std::filesystem::filesystem_error fsException) - { - printf("std::filesystem failed with message: %s\n", fsException.what()); - } - printf("Formatted EmuDisk Partition%d\n", CxbxGetPartitionNumberFromHandle(hFile)); }