Merge pull request #5964 from JosJuice/wxstring-ternary

Fix DolphinWX build issue
This commit is contained in:
Markus Wick 2017-08-22 16:26:48 +02:00 committed by GitHub
commit ef4e4a9a76

View File

@ -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()