From f90b79791fda8ebc781586c4f48bf486e6f12edf Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 31 Jul 2022 16:08:07 +0200 Subject: [PATCH] HLE: fix file not found errors in media functions --- rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp | 2 -- rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp | 6 +++--- rpcs3/main_application.cpp | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp b/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp index 555db2a6db..3b83641434 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp @@ -96,8 +96,6 @@ void music_selection_context::set_playlist(const std::string& path) for (auto&& dir_entry : fs::dir{path}) { - dir_entry.name = vfs::unescape(dir_entry.name); - if (dir_entry.name == "." || dir_entry.name == "..") { continue; diff --git a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp index 7af72640c2..09424a455f 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp @@ -277,15 +277,15 @@ namespace rsx { for (auto&& dir_entry : fs::dir{media_path}) { - dir_entry.name = vfs::unescape(dir_entry.name); - if (dir_entry.name == "." || dir_entry.name == "..") { continue; } + const std::string unescaped_name = vfs::unescape(dir_entry.name); + media_list_dialog::media_entry new_entry{}; - parse_media_recursive(depth, media_path + "/" + dir_entry.name, dir_entry.name, type, new_entry); + parse_media_recursive(depth, media_path + "/" + dir_entry.name, unescaped_name, type, new_entry); if (new_entry.type != media_list_dialog::media_type::invalid) { new_entry.parent = ¤t_entry; diff --git a/rpcs3/main_application.cpp b/rpcs3/main_application.cpp index c75ca809b1..6549f13b40 100644 --- a/rpcs3/main_application.cpp +++ b/rpcs3/main_application.cpp @@ -191,7 +191,7 @@ EmuCallbacks main_application::CreateCallbacks() } else { - sys_log.warning("get_image_info failed to read '%s'. Error='%s'", filename, reader.errorString().toStdString()); + sys_log.error("get_image_info failed to read '%s'. Error='%s'", filename, reader.errorString().toStdString()); } }); return success;