From 51a7150990f26f3723dd485e17250a78d36d3eb1 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 22 Aug 2017 13:35:20 +0200 Subject: [PATCH] Fix DolphinWX build issue I'm not sure why this hasn't popped up as an error on the buildbots, but the build fails on my new install of VS2017. The error is C2445: result type of conditional expression is ambiguous: types 'wxString' and 'const char [1]' can be converted to multiple common types --- Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp | 5 +++-- 1 file 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(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) : ""); + m_clock_override_text->SetLabel(SConfig::GetInstance().m_OCEnable ? + wxString::Format("%d %% (%d MHz)", percent, clock) : + wxString()); } void AdvancedConfigPane::LoadCustomRTC()