From cae8bb33c334d34afeb84b668b848cce07030103 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 17 Jan 2013 01:24:02 -0600 Subject: [PATCH] Fix initial theme selection. --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index fbc2a18346..423885e0f2 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -611,13 +611,12 @@ void CConfigMain::CreateGUIControls() name += ext; if (-1 == theme_selection->FindString(name)) theme_selection->Append(name); - - if (SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name == name) - theme_selection->SetSelection(theme_selection->GetCount() - 1); }); + + theme_selection->SetStringSelection(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name); // std::function = avoid error on msvc - theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, function([this,theme_selection](wxEvent&) + theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, function([theme_selection](wxEvent&) { SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection(); main_frame->InitBitmaps();