Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix initial theme selection.
  • Loading branch information
jordan-woyak committed Jan 17, 2013
1 parent 4dad8dd commit cae8bb3
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Source/Core/DolphinWX/Src/ConfigMain.cpp
Expand Up @@ -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<void(wxEvent&)>([this,theme_selection](wxEvent&)
theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, function<void(wxEvent&)>([theme_selection](wxEvent&)
{
SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection();
main_frame->InitBitmaps();
Expand Down

0 comments on commit cae8bb3

Please sign in to comment.