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

Don't load custom configs when adding games

Browse source
This commit is contained in:
Megamouse 2020-05-07 03:31:32 +02:00
parent e1042bc631
commit 8e2b2bc179
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/System.cpp
View file

@ -848,8 +848,8 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
m_title_id = psf::get_string(_psf, "TITLE_ID"); m_title_id = psf::get_string(_psf, "TITLE_ID");
m_cat = psf::get_string(_psf, "CATEGORY"); m_cat = psf::get_string(_psf, "CATEGORY");
std::string version_app = psf::get_string(_psf, "APP_VER", "Unknown"); const std::string version_app = psf::get_string(_psf, "APP_VER", "Unknown");
std::string version_disc = psf::get_string(_psf, "VERSION", "Unknown"); const std::string version_disc = psf::get_string(_psf, "VERSION", "Unknown");
if (!_psf.empty() && m_cat.empty()) if (!_psf.empty() && m_cat.empty())
{ {
@ -862,7 +862,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
sys_log.notice("Category: %s", GetCat()); sys_log.notice("Category: %s", GetCat());
sys_log.notice("Version: %s / %s", version_app, version_disc); sys_log.notice("Version: %s / %s", version_app, version_disc);
if (!force_global_config) if (!add_only && !force_global_config)
{ {
const std::string config_path_new = GetCustomConfigPath(m_title_id); const std::string config_path_new = GetCustomConfigPath(m_title_id);
const std::string config_path_old = GetCustomConfigPath(m_title_id, true); const std::string config_path_old = GetCustomConfigPath(m_title_id, true);

4
rpcs3/Emu/System.h
View file

@ -59,8 +59,8 @@ class Emulator final
EmuCallbacks m_cb; EmuCallbacks m_cb;
atomic_t<u64> m_pause_start_time; // set when paused atomic_t<u64> m_pause_start_time{0}; // set when paused
atomic_t<u64> m_pause_amend_time; // increased when resumed atomic_t<u64> m_pause_amend_time{0}; // increased when resumed
std::string m_path; std::string m_path;
std::string m_path_old; std::string m_path_old;