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

Patch from Jake: On some scenarios EmuCore config would be saved to both vm.ini and ui.ini. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4242 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
avihal@gmail.com 2011-01-22 04:19:07 +00:00
parent abf620141b
commit fdd9dd807e
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/gui/MainFrame.h
View File

@ -152,7 +152,6 @@ protected:
void ApplySettings(); void ApplySettings();
void ApplyCoreStatus(); void ApplyCoreStatus();
void SaveEmuOptions();
void InitLogBoxPosition( AppConfig::ConsoleLogOptions& conf ); void InitLogBoxPosition( AppConfig::ConsoleLogOptions& conf );

21
pcsx2/gui/MainMenuClicks.cpp
View File

@ -29,15 +29,6 @@
using namespace Dialogs; using namespace Dialogs;
void MainEmuFrame::SaveEmuOptions()
{
if (wxConfigBase* conf = GetAppConfig())
{
IniSaver saver(*conf);
g_Conf->EmuOptions.LoadSave(saver);
}
}
void MainEmuFrame::Menu_SysSettings_Click(wxCommandEvent &event) void MainEmuFrame::Menu_SysSettings_Click(wxCommandEvent &event)
{ {
AppOpenDialog<SysConfigDialog>( this ); AppOpenDialog<SysConfigDialog>( this );
@ -409,7 +400,7 @@ void MainEmuFrame::Menu_MultitapToggle_Click( wxCommandEvent& )
g_Conf->EmuOptions.MultitapPort0_Enabled = GetMenuBar()->IsChecked( MenuId_Config_Multitap0Toggle ); g_Conf->EmuOptions.MultitapPort0_Enabled = GetMenuBar()->IsChecked( MenuId_Config_Multitap0Toggle );
g_Conf->EmuOptions.MultitapPort1_Enabled = GetMenuBar()->IsChecked( MenuId_Config_Multitap1Toggle ); g_Conf->EmuOptions.MultitapPort1_Enabled = GetMenuBar()->IsChecked( MenuId_Config_Multitap1Toggle );
AppApplySettings(); AppApplySettings();
SaveEmuOptions(); AppSaveSettings();
//evt.Skip(); //evt.Skip();
} }
@ -417,19 +408,19 @@ void MainEmuFrame::Menu_MultitapToggle_Click( wxCommandEvent& )
void MainEmuFrame::Menu_EnablePatches_Click( wxCommandEvent& ) void MainEmuFrame::Menu_EnablePatches_Click( wxCommandEvent& )
{ {
g_Conf->EmuOptions.EnablePatches = GetMenuBar()->IsChecked( MenuId_EnablePatches ); g_Conf->EmuOptions.EnablePatches = GetMenuBar()->IsChecked( MenuId_EnablePatches );
SaveEmuOptions(); AppSaveSettings();
} }
void MainEmuFrame::Menu_EnableCheats_Click( wxCommandEvent& ) void MainEmuFrame::Menu_EnableCheats_Click( wxCommandEvent& )
{ {
g_Conf->EmuOptions.EnableCheats = GetMenuBar()->IsChecked( MenuId_EnableCheats ); g_Conf->EmuOptions.EnableCheats = GetMenuBar()->IsChecked( MenuId_EnableCheats );
SaveEmuOptions(); AppSaveSettings();
} }
void MainEmuFrame::Menu_EnableHostFs_Click( wxCommandEvent& ) void MainEmuFrame::Menu_EnableHostFs_Click( wxCommandEvent& )
{ {
g_Conf->EmuOptions.HostFs = GetMenuBar()->IsChecked( MenuId_EnableHostFs ); g_Conf->EmuOptions.HostFs = GetMenuBar()->IsChecked( MenuId_EnableHostFs );
SaveEmuOptions(); AppSaveSettings();
} }
void MainEmuFrame::Menu_OpenELF_Click(wxCommandEvent&) void MainEmuFrame::Menu_OpenELF_Click(wxCommandEvent&)
@ -555,14 +546,14 @@ void MainEmuFrame::Menu_ShowConsole(wxCommandEvent &event)
void MainEmuFrame::Menu_ShowConsole_Stdio(wxCommandEvent &event) void MainEmuFrame::Menu_ShowConsole_Stdio(wxCommandEvent &event)
{ {
g_Conf->EmuOptions.ConsoleToStdio = GetMenuBar()->IsChecked( MenuId_Console_Stdio ); g_Conf->EmuOptions.ConsoleToStdio = GetMenuBar()->IsChecked( MenuId_Console_Stdio );
SaveEmuOptions(); AppSaveSettings();
} }
void MainEmuFrame::Menu_PrintCDVD_Info(wxCommandEvent &event) void MainEmuFrame::Menu_PrintCDVD_Info(wxCommandEvent &event)
{ {
g_Conf->EmuOptions.CdvdVerboseReads = GetMenuBar()->IsChecked( MenuId_CDVD_Info ); g_Conf->EmuOptions.CdvdVerboseReads = GetMenuBar()->IsChecked( MenuId_CDVD_Info );
const_cast<Pcsx2Config&>(EmuConfig).CdvdVerboseReads = g_Conf->EmuOptions.CdvdVerboseReads; // read-only in core thread, so it's safe to modify. const_cast<Pcsx2Config&>(EmuConfig).CdvdVerboseReads = g_Conf->EmuOptions.CdvdVerboseReads; // read-only in core thread, so it's safe to modify.
SaveEmuOptions(); AppSaveSettings();
} }
void MainEmuFrame::Menu_ShowAboutBox(wxCommandEvent &event) void MainEmuFrame::Menu_ShowAboutBox(wxCommandEvent &event)