mirror of https://github.com/PCSX2/pcsx2.git
eh, oops. let's not clear memcard settings on ok/apply.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2545 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
3d131a7ea4
commit
c44db64537
|
@ -89,9 +89,8 @@ void Panels::MemoryCardsPanel::SingleCardPanel::Apply()
|
||||||
{
|
{
|
||||||
AppConfig::McdOptions& mcd( g_Conf->Mcd[m_port][m_slot] );
|
AppConfig::McdOptions& mcd( g_Conf->Mcd[m_port][m_slot] );
|
||||||
|
|
||||||
mcd.Enabled = m_check_Disable->GetValue();
|
//mcd.Enabled = m_check_Disable->GetValue();
|
||||||
|
//mcd.Filename = m_filepicker->GetPath();
|
||||||
mcd.Filename = m_filepicker->GetPath();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Panels::MemoryCardsPanel::SingleCardPanel::AppStatusEvent_OnSettingsApplied()
|
void Panels::MemoryCardsPanel::SingleCardPanel::AppStatusEvent_OnSettingsApplied()
|
||||||
|
@ -209,16 +208,14 @@ Panels::MemoryCardsPanel::MemoryCardsPanel( wxWindow* parent )
|
||||||
*s_table += columns[port] | StdExpand();
|
*s_table += columns[port] | StdExpand();
|
||||||
}
|
}
|
||||||
|
|
||||||
*this += s_table | pxExpand;
|
|
||||||
|
|
||||||
wxBoxSizer* s_checks = new wxBoxSizer( wxVERTICAL );
|
wxBoxSizer* s_checks = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
*this += s_checks | StdExpand();
|
|
||||||
|
|
||||||
*s_checks += m_check_Ejection;
|
*s_checks += m_check_Ejection;
|
||||||
|
|
||||||
|
*this += s_table | pxExpand;
|
||||||
|
*this += s_checks | StdExpand();
|
||||||
|
|
||||||
AppStatusEvent_OnSettingsApplied();
|
AppStatusEvent_OnSettingsApplied();
|
||||||
|
|
||||||
Disable(); // it's all broken right now, so disable it
|
Disable(); // it's all broken right now, so disable it
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue