diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-04-30 05:38:09 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-04-30 05:38:09 -0400 |
| commit | 1fded22afa697b28b1a3b4338ffc1d38f6a30d73 (patch) | |
| tree | 2b8117339187dbd227411081189b5947b44e89d7 /Source/Core | |
| parent | 989c0f427fe70dfedcac8a8cadcc8c677f7c2044 (diff) | |
| parent | cd7466864e3392c89ef00125bf57edb7dbd02c39 (diff) | |
Merge pull request #2346 from illuminatedgeek/cpu-override-slider-enabled
Make OC slider match enabled state on window load
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp index ed47796667..80896202f1 100644 --- a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp @@ -63,8 +63,10 @@ void AdvancedConfigPane::InitializeGUI() void AdvancedConfigPane::LoadGUIValues() { int ocFactor = (int)(std::log2f(SConfig::GetInstance().m_OCFactor) * 25.f + 100.f + 0.5f); - m_clock_override_checkbox->SetValue(SConfig::GetInstance().m_OCEnable); + bool oc_enabled = SConfig::GetInstance().m_OCEnable; + m_clock_override_checkbox->SetValue(oc_enabled); m_clock_override_slider ->SetValue(ocFactor); + m_clock_override_slider->Enable(oc_enabled); UpdateCPUClock(); } |