From 4662e25cbb15e00c3719814f291758e49356463c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 29 Jan 2017 15:25:27 +0100 Subject: [PATCH] DolphinWX: Fix overclock slider clock display --- Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp index 732b770ce6..4c001c6310 100644 --- a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp @@ -16,6 +16,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/HW/SystemTimers.h" #include "DolphinWX/DolphinSlider.h" #include "DolphinWX/WxEventUtils.h" @@ -181,12 +182,12 @@ void AdvancedConfigPane::OnCustomRTCTimeChanged(wxCommandEvent& event) void AdvancedConfigPane::UpdateCPUClock() { - bool wii = SConfig::GetInstance().bWii; - int percent = (int)(std::roundf(SConfig::GetInstance().m_OCFactor * 100.f)); - int clock = (int)(std::roundf(SConfig::GetInstance().m_OCFactor * (wii ? 729.f : 486.f))); + int core_clock = SystemTimers::GetTicksPerSecond() / pow(10, 6); + int percent = static_cast(std::round(SConfig::GetInstance().m_OCFactor * 100.f)); + int clock = static_cast(std::round(SConfig::GetInstance().m_OCFactor * core_clock)); m_clock_override_text->SetLabel( - SConfig::GetInstance().m_OCEnable ? wxString::Format("%d %% (%d mhz)", percent, clock) : ""); + SConfig::GetInstance().m_OCEnable ? wxString::Format("%d %% (%d MHz)", percent, clock) : ""); } void AdvancedConfigPane::LoadCustomRTC()