diff --git a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp index 828ddf170c..358b0367cf 100644 --- a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp +++ b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp @@ -98,6 +98,7 @@ bool IsSettingSaveable(const Config::Location& config_location) &Config::GetInfoForSimulateKonga(2).GetLocation(), &Config::GetInfoForSimulateKonga(3).GetLocation(), &Config::MAIN_EMULATION_SPEED.GetLocation(), + &Config::MAIN_PERF_MAP_DIR.GetLocation(), // UI.General diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 2f7607feac..9e47845899 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -121,7 +121,6 @@ void SConfig::SaveCoreSettings(IniFile& ini) core->Set("WiimoteControllerInterface", connect_wiimotes_for_ciface); core->Set("MMU", bMMU); core->Set("GPUDeterminismMode", m_strGPUDeterminismMode); - core->Set("PerfMapDir", m_perfDir); } void SConfig::LoadSettings() @@ -165,7 +164,6 @@ void SConfig::LoadCoreSettings(IniFile& ini) core->Get("FastDiscSpeed", &bFastDiscSpeed, false); core->Get("DisableICache", &bDisableICache, false); core->Get("GPUDeterminismMode", &m_strGPUDeterminismMode, "auto"); - core->Get("PerfMapDir", &m_perfDir, ""); } void SConfig::ResetRunningGameMetadata() diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 6a703a2746..685a69fe05 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -103,8 +103,6 @@ struct SConfig std::string m_strBootROM; std::string m_strSRAM; - std::string m_perfDir; - std::string m_debugger_game_id; // TODO: remove this as soon as the ticket view hack in IOS/ES/Views is dropped. bool m_disc_booted_from_game_list = false; diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp index b25e3fba90..de55900846 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp @@ -13,7 +13,7 @@ #include "Common/CommonTypes.h" #include "Common/JitRegister.h" -#include "Core/ConfigManager.h" +#include "Core/Config/MainSettings.h" #include "Core/Core.h" #include "Core/PowerPC/JitCommon/JitBase.h" #include "Core/PowerPC/MMU.h" @@ -40,7 +40,7 @@ JitBaseBlockCache::~JitBaseBlockCache() = default; void JitBaseBlockCache::Init() { - JitRegister::Init(SConfig::GetInstance().m_perfDir); + JitRegister::Init(Config::Get(Config::MAIN_PERF_MAP_DIR)); Clear(); }