diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-01-17 01:24:02 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-01-17 01:24:02 -0600 |
| commit | cae8bb33c334d34afeb84b668b848cce07030103 (patch) | |
| tree | 6e704774d6755090599331ac773cb06d606bd371 /Source/Core | |
| parent | 4dad8ddd834c8165516537300eb22e8b298caf75 (diff) | |
Fix initial theme selection.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/ConfigMain.cpp | 7 |
1 files 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<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(); |