From b43f7c85cc8a5553382b048c83ff83f50fb34c8b Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 3 Dec 2020 20:59:45 +0100 Subject: DiscIO: Fix recursive directory extraction https://bugs.dolphin-emu.org/issues/12331 --- Source/Core/DiscIO/DiscExtractor.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Source/Core/DiscIO/DiscExtractor.cpp') diff --git a/Source/Core/DiscIO/DiscExtractor.cpp b/Source/Core/DiscIO/DiscExtractor.cpp index 225302bb9c..acf692a4f4 100644 --- a/Source/Core/DiscIO/DiscExtractor.cpp +++ b/Source/Core/DiscIO/DiscExtractor.cpp @@ -130,8 +130,10 @@ void ExportDirectory(const Volume& volume, const Partition& partition, const Fil const std::string& export_folder, const std::function& update_progress) { - const std::string export_root = - export_folder + (directory.IsDirectory() ? "/" + directory.GetName() + "/" : "/"); + std::string export_root = export_folder + '/'; + if (directory.IsDirectory() && !directory.IsRoot()) + export_root += directory.GetName() + '/'; + File::CreateFullPath(export_root); for (const FileInfo& file_info : directory) @@ -154,7 +156,8 @@ void ExportDirectory(const Volume& volume, const Partition& partition, const Fil } else if (recursive) { - ExportDirectory(volume, partition, file_info, recursive, path, export_path, update_progress); + ExportDirectory(volume, partition, file_info, recursive, filesystem_path, export_root, + update_progress); } } } -- cgit v1.2.3