From c375111076235313669e71953c877c9512cebd16 Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 12 Jun 2015 13:56:53 +0200 Subject: Options: merge SCoreStartupParameter into SConfig --- Source/Core/DolphinWX/Config/PathConfigPane.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/DolphinWX/Config/PathConfigPane.cpp') 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) -- cgit v1.2.3