mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-22 12:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix moving game dir

Browse Source
This commit is contained in:
Nekotekina 2017-07-12 19:35:46 +03:00
parent a5c431c2b7
commit 113b937263
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rpcs3/Emu/System.cpp
View File

@ -292,23 +292,22 @@ void Emulator::Load()
games.reset(); games.reset();
} }
// Open SELF or ELF
fs::file elf_file(m_path);
if (!elf_file)
{
LOG_ERROR(LOADER, "Failed to open file: %s", m_path);
return;
}
LOG_NOTICE(LOADER, "Path: %s", m_path); LOG_NOTICE(LOADER, "Path: %s", m_path);
const std::string elf_dir = fs::get_parent_dir(m_path); const std::string elf_dir = fs::get_parent_dir(m_path);
const fs::file sfov(elf_dir + "/sce_sys/param.sfo");
const fs::file sfo1(elf_dir + "/../PARAM.SFO");
// Load PARAM.SFO (TODO) // Load PARAM.SFO (TODO)
const auto _psf = psf::load_object(sfov ? sfov : sfo1); const auto _psf = psf::load_object([&]
{
if (fs::file sfov{elf_dir + "/sce_sys/param.sfo"})
{
return sfov;
}
else
{
return fs::file(elf_dir + "/../PARAM.SFO");
}
}());
m_title = psf::get_string(_psf, "TITLE", m_path); m_title = psf::get_string(_psf, "TITLE", m_path);
m_title_id = psf::get_string(_psf, "TITLE_ID"); m_title_id = psf::get_string(_psf, "TITLE_ID");
const auto _cat = psf::get_string(_psf, "CATEGORY"); const auto _cat = psf::get_string(_psf, "CATEGORY");
@ -446,6 +445,15 @@ void Emulator::Load()
vfs::mount("host_root", {}); vfs::mount("host_root", {});
} }
// Open SELF or ELF
fs::file elf_file(m_path);
if (!elf_file)
{
LOG_ERROR(LOADER, "Failed to open executable: %s", m_path);
return;
}
// Check SELF header // Check SELF header
if (elf_file.size() >= 4 && elf_file.read<u32>() == "SCE\0"_u32) if (elf_file.size() >= 4 && elf_file.read<u32>() == "SCE\0"_u32)
{ {