ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wx: Fix trace log settings getting very confused

This commit is contained in:
Connor McLaughlin 2021-10-05 11:58:31 +10:00 committed by refractionpcsx2
parent 1f386cf8bd
commit 00fbc8289d
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pcsx2/gui/AppConfig.cpp
View File

@ -1175,10 +1175,12 @@ static void LoadUiSettings()
ConLog_LoadSaveSettings(loader); ConLog_LoadSaveSettings(loader);
SysTraceLog_LoadSaveSettings(loader); SysTraceLog_LoadSaveSettings(loader);
wxSettingsInterface wxsi(&loader.GetConfig()); {
SettingsLoadWrapper wrapper(wxsi); wxSettingsInterface wxsi(&loader.GetConfig());
g_Conf = std::make_unique<AppConfig>(); SettingsLoadWrapper wrapper(wxsi);
g_Conf->LoadSave(loader, wrapper); g_Conf = std::make_unique<AppConfig>();
g_Conf->LoadSave(loader, wrapper);
}
if (!wxFile::Exists(g_Conf->CurrentIso)) if (!wxFile::Exists(g_Conf->CurrentIso))
{ {
@ -1194,11 +1196,13 @@ static void LoadVmSettings()
// are regulated by the PCSX2 UI. // are regulated by the PCSX2 UI.
std::unique_ptr<wxFileConfig> vmini(OpenFileConfig(GetVmSettingsFilename())); std::unique_ptr<wxFileConfig> vmini(OpenFileConfig(GetVmSettingsFilename()));
wxSettingsInterface wxsi(vmini.get());
IniLoader vmloader(vmini.get()); IniLoader vmloader(vmini.get());
SettingsLoadWrapper vmwrapper(wxsi); {
g_Conf->EmuOptions.LoadSave(vmwrapper); wxSettingsInterface wxsi(vmini.get());
g_Conf->EmuOptions.GS.LimitScalar = g_Conf->EmuOptions.Framerate.NominalScalar; SettingsLoadWrapper vmwrapper(wxsi);
g_Conf->EmuOptions.LoadSave(vmwrapper);
g_Conf->EmuOptions.GS.LimitScalar = g_Conf->EmuOptions.Framerate.NominalScalar;
}
if (g_Conf->EnablePresets) if (g_Conf->EnablePresets)
{ {
@ -1227,9 +1231,11 @@ static void SaveUiSettings()
sApp.GetRecentIsoManager().Add(g_Conf->CurrentIso); sApp.GetRecentIsoManager().Add(g_Conf->CurrentIso);
AppIniSaver saver; AppIniSaver saver;
wxSettingsInterface wxsi(&saver.GetConfig()); {
SettingsSaveWrapper wrapper(wxsi); wxSettingsInterface wxsi(&saver.GetConfig());
g_Conf->LoadSave(saver, wrapper); SettingsSaveWrapper wrapper(wxsi);
g_Conf->LoadSave(saver, wrapper);
}
ConLog_LoadSaveSettings(saver); ConLog_LoadSaveSettings(saver);
SysTraceLog_LoadSaveSettings(saver); SysTraceLog_LoadSaveSettings(saver);
@ -1239,10 +1245,12 @@ static void SaveUiSettings()
static void SaveVmSettings() static void SaveVmSettings()
{ {
std::unique_ptr<wxFileConfig> vmini(OpenFileConfig(GetVmSettingsFilename())); std::unique_ptr<wxFileConfig> vmini(OpenFileConfig(GetVmSettingsFilename()));
wxSettingsInterface wxsi(vmini.get());
IniSaver vmsaver(vmini.get()); IniSaver vmsaver(vmini.get());
SettingsSaveWrapper vmwrapper(wxsi); {
g_Conf->EmuOptions.LoadSave(vmwrapper); wxSettingsInterface wxsi(vmini.get());
SettingsSaveWrapper vmwrapper(wxsi);
g_Conf->EmuOptions.LoadSave(vmwrapper);
}
sApp.DispatchVmSettingsEvent(vmsaver); sApp.DispatchVmSettingsEvent(vmsaver);
} }