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/InterfaceConfigPane.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp') diff --git a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp index a57774a8cd..1e3cfb10ed 100644 --- a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp @@ -141,7 +141,7 @@ void InterfaceConfigPane::InitializeGUI() void InterfaceConfigPane::LoadGUIValues() { - const SCoreStartupParameter& startup_params = SConfig::GetInstance().m_LocalCoreStartupParameter; + const SConfig& startup_params = SConfig::GetInstance(); m_confirm_stop_checkbox->SetValue(startup_params.bConfirmStop); m_panic_handlers_checkbox->SetValue(startup_params.bUsePanicHandlers); @@ -177,23 +177,23 @@ void InterfaceConfigPane::LoadThemes() m_theme_choice->Append(wxname); } - m_theme_choice->SetStringSelection(StrToWxStr(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name)); + m_theme_choice->SetStringSelection(StrToWxStr(SConfig::GetInstance().theme_name)); } void InterfaceConfigPane::OnConfirmStopCheckBoxChanged(wxCommandEvent& event) { - SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop = m_confirm_stop_checkbox->IsChecked(); + SConfig::GetInstance().bConfirmStop = m_confirm_stop_checkbox->IsChecked(); } void InterfaceConfigPane::OnPanicHandlersCheckBoxChanged(wxCommandEvent& event) { - SConfig::GetInstance().m_LocalCoreStartupParameter.bUsePanicHandlers = m_panic_handlers_checkbox->IsChecked(); + SConfig::GetInstance().bUsePanicHandlers = m_panic_handlers_checkbox->IsChecked(); SetEnableAlert(m_panic_handlers_checkbox->IsChecked()); } void InterfaceConfigPane::OnOSDMessagesCheckBoxChanged(wxCommandEvent& event) { - SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages = m_osd_messages_checkbox->IsChecked(); + SConfig::GetInstance().bOnScreenDisplayMessages = m_osd_messages_checkbox->IsChecked(); } void InterfaceConfigPane::OnInterfaceLanguageChoiceChanged(wxCommandEvent& event) @@ -211,7 +211,7 @@ void InterfaceConfigPane::OnPauseOnFocusLostCheckBoxChanged(wxCommandEvent& even void InterfaceConfigPane::OnThemeSelected(wxCommandEvent& event) { - SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = WxStrToStr(m_theme_choice->GetStringSelection()); + SConfig::GetInstance().theme_name = WxStrToStr(m_theme_choice->GetStringSelection()); main_frame->InitBitmaps(); main_frame->UpdateGameList(); -- cgit v1.2.3