diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index bace9b7971..3f1ba69e06 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -264,6 +264,7 @@ void SConfig::SaveCoreSettings(IniFile& ini) core->Set("GPUDeterminismMode", m_strGPUDeterminismMode); core->Set("GameCubeAdapter", m_GameCubeAdapter); core->Set("AdapterRumble", m_AdapterRumble); + core->Set("PerfMapDir", m_perfDir); } void SConfig::SaveMovieSettings(IniFile& ini) @@ -522,6 +523,7 @@ void SConfig::LoadCoreSettings(IniFile& ini) core->Get("GPUDeterminismMode", &m_strGPUDeterminismMode, "auto"); core->Get("GameCubeAdapter", &m_GameCubeAdapter, true); core->Get("AdapterRumble", &m_AdapterRumble, true); + core->Get("PerfMapDir", &m_perfDir, ""); } void SConfig::LoadMovieSettings(IniFile& ini) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 43a79ac6f7..150fef7f37 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -104,12 +104,10 @@ bool DolphinApp::OnInit() bool UseLogger = false; bool selectVideoBackend = false; bool selectAudioEmulation = false; - bool selectPerfDir = false; wxString videoBackendName; wxString audioEmulationName; wxString userPath; - wxString perfDir; #if wxUSE_CMDLINE_PARSER // Parse command lines wxCmdLineEntryDesc cmdLineDesc[] = @@ -159,11 +157,6 @@ bool DolphinApp::OnInit() "User folder path", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, - { - wxCMD_LINE_OPTION, "P", "perf_dir", - "Directory for Linux perf perf-$pid.map file", - wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL - }, { wxCMD_LINE_NONE, nullptr, nullptr, nullptr, wxCMD_LINE_VAL_NONE, 0 } @@ -189,7 +182,6 @@ bool DolphinApp::OnInit() BatchMode = parser.Found("batch"); selectVideoBackend = parser.Found("video_backend", &videoBackendName); selectAudioEmulation = parser.Found("audio_emulation", &audioEmulationName); - selectPerfDir = parser.Found("perf_dir", &perfDir); playMovie = parser.Found("movie", &movieFile); parser.Found("user", &userPath); #endif // wxUSE_CMDLINE_PARSER @@ -207,12 +199,6 @@ bool DolphinApp::OnInit() InitLanguageSupport(); // The language setting is loaded from the user directory UICommon::Init(); - if (selectPerfDir) - { - SConfig::GetInstance().m_perfDir = - WxStrToStr(perfDir); - } - if (selectVideoBackend && videoBackendName != wxEmptyString) SConfig::GetInstance().m_strVideoBackend = WxStrToStr(videoBackendName);