diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2018-07-05 22:48:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 22:48:21 +0200 |
| commit | fbf445154b7398ae16ca294b7f0c6a34305a0ddd (patch) | |
| tree | 8b1dcb826c2f9a51336d933295e4e61b5ee34bd7 /Source | |
| parent | 233787e8a7b783a3ac9094fb3e24cf15f606afe0 (diff) | |
| parent | cd8e3efb215f01179c64c1be0a497ecbc2d75af2 (diff) | |
Merge pull request #7217 from Techjar/qt-clock-speed-slider
Qt/AdvancedPane: Fix CPU clock slider not updating on emulation state change
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinQt2/Settings/AdvancedPane.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt2/Settings/AdvancedPane.cpp b/Source/Core/DolphinQt2/Settings/AdvancedPane.cpp index 70e79201f8..1cac06d60e 100644 --- a/Source/Core/DolphinQt2/Settings/AdvancedPane.cpp +++ b/Source/Core/DolphinQt2/Settings/AdvancedPane.cpp @@ -104,8 +104,6 @@ void AdvancedPane::ConnectLayout() Update(); }); - m_cpu_clock_override_slider->setValue( - static_cast<int>(std::ceil(std::log2f(SConfig::GetInstance().m_OCFactor) * 25.f + 100.f))); connect(m_cpu_clock_override_slider, &QSlider::valueChanged, [this](int oc_factor) { // Vaguely exponential scaling? SConfig::GetInstance().m_OCFactor = @@ -137,6 +135,9 @@ void AdvancedPane::Update() m_cpu_clock_override_slider->setEnabled(enable_cpu_clock_override_widgets); m_cpu_clock_override_slider_label->setEnabled(enable_cpu_clock_override_widgets); + m_cpu_clock_override_slider->setValue( + static_cast<int>(std::ceil(std::log2f(SConfig::GetInstance().m_OCFactor) * 25.f + 100.f))); + m_cpu_clock_override_slider_label->setText([] { int core_clock = SystemTimers::GetTicksPerSecond() / std::pow(10, 6); int percent = static_cast<int>(std::round(SConfig::GetInstance().m_OCFactor * 100.f)); |