diff options
| author | Markus Wick <markus@selfnet.de> | 2015-06-12 22:42:45 +0200 |
|---|---|---|
| committer | Markus Wick <markus@selfnet.de> | 2015-06-12 22:42:45 +0200 |
| commit | 740e34484704c64bf95b2143e9601a8834cbe8db (patch) | |
| tree | 4008bc8648422c51521a65b5209d0b641e9aea07 /Source/Core/DolphinWX/Config/PathConfigPane.cpp | |
| parent | 5ae1c07cd4a06f3738e461785bc364667dfd9129 (diff) | |
| parent | c375111076235313669e71953c877c9512cebd16 (diff) | |
Merge pull request #2594 from degasus/master
Options: merge SCoreStartupParameter into SConfig
Diffstat (limited to 'Source/Core/DolphinWX/Config/PathConfigPane.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Config/PathConfigPane.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Config/PathConfigPane.cpp b/Source/Core/DolphinWX/Config/PathConfigPane.cpp index efde03d64d..2c72b17a01 100644 --- a/Source/Core/DolphinWX/Config/PathConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/PathConfigPane.cpp @@ -92,7 +92,7 @@ void PathConfigPane::InitializeGUI() void PathConfigPane::LoadGUIValues() { - const SCoreStartupParameter& startup_params = SConfig::GetInstance().m_LocalCoreStartupParameter; + const SConfig& startup_params = SConfig::GetInstance(); m_recursive_iso_paths_checkbox->SetValue(SConfig::GetInstance().m_RecursiveISOFolder); m_default_iso_filepicker->SetPath(StrToWxStr(startup_params.m_strDefaultISO)); @@ -159,17 +159,17 @@ void PathConfigPane::OnRemoveISOPath(wxCommandEvent& event) void PathConfigPane::OnDefaultISOChanged(wxCommandEvent& event) { - SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultISO = WxStrToStr(m_default_iso_filepicker->GetPath()); + SConfig::GetInstance().m_strDefaultISO = WxStrToStr(m_default_iso_filepicker->GetPath()); } void PathConfigPane::OnDVDRootChanged(wxCommandEvent& event) { - SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDVDRoot = WxStrToStr(m_dvd_root_dirpicker->GetPath()); + SConfig::GetInstance().m_strDVDRoot = WxStrToStr(m_dvd_root_dirpicker->GetPath()); } void PathConfigPane::OnApploaderPathChanged(wxCommandEvent& event) { - SConfig::GetInstance().m_LocalCoreStartupParameter.m_strApploader = WxStrToStr(m_apploader_path_filepicker->GetPath()); + SConfig::GetInstance().m_strApploader = WxStrToStr(m_apploader_path_filepicker->GetPath()); } void PathConfigPane::OnNANDRootChanged(wxCommandEvent& event) |