Merge pull request #5964 from JosJuice/wxstring-ternary

Fix DolphinWX build issue
dolphin-emu · Aug 22, 2017 · ef4e4a9 · ef4e4a9
2 parents 9cdf4b5 + 51a7150
commit ef4e4a9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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()