archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 15:31:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make system config thread-safe (almost)

Browse source
This commit is contained in:
Nekotekina 2020-01-20 19:08:57 +03:00
parent 0147bc2c72
commit 0f87c6c7c3
4 changed files with 53 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Emu/System.cpp
View file

@ -1847,12 +1847,16 @@ void Emulator::Stop(bool restart)
std::string cfg_root::node_vfs::get(const cfg::string& _cfg, const char* _def) const
{
if (_cfg.get().empty())
auto [spath, sshared] = _cfg.get();
if (spath.empty())
{
return fs::get_config_dir() + _def;
}
return fmt::replace_all(_cfg.get(), "$(EmulatorDir)", emulator_dir.get().empty() ? fs::get_config_dir() : emulator_dir.get());
auto [semudir, sshared2] = emulator_dir.get();
return fmt::replace_all(spath, "$(EmulatorDir)", semudir.empty() ? fs::get_config_dir() : semudir);
}
s32 error_code::error_report(const fmt_type_info* sup, u64 arg, const fmt_type_info* sup2, u64 arg2)