diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-08-22 16:26:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 16:26:48 +0200 |
| commit | ef4e4a9a76f27877552ef1b18b13a7ec9f9df7ff (patch) | |
| tree | 4d799e18806aa6b000a5331b883690547fa166c1 /Source/Core | |
| parent | 9cdf4b5eaaaec1177f79971e300298b0e950c309 (diff) | |
| parent | 51a7150990f26f3723dd485e17250a78d36d3eb1 (diff) | |
Merge pull request #5964 from JosJuice/wxstring-ternary
Fix DolphinWX build issue
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp index b7957d7512..5a194d9c20 100644 --- a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp @@ -203,8 +203,9 @@ void AdvancedConfigPane::UpdateCPUClock() int percent = static_cast<int>(std::round(SConfig::GetInstance().m_OCFactor * 100.f)); int clock = static_cast<int>(std::round(SConfig::GetInstance().m_OCFactor * core_clock)); - m_clock_override_text->SetLabel( - SConfig::GetInstance().m_OCEnable ? wxString::Format("%d %% (%d MHz)", percent, clock) : ""); + m_clock_override_text->SetLabel(SConfig::GetInstance().m_OCEnable ? + wxString::Format("%d %% (%d MHz)", percent, clock) : + wxString()); } void AdvancedConfigPane::LoadCustomRTC() |