Merge pull request #6071 from lioncash/inputconfig

InputConfigDiag: Fix building DolphinWX on the latest MSVC
2017-09-17 11:11:37 +02:00 · 2017-09-17 11:11:37 +02:00 · 29bfdbb36b
parent d7aa49a1a7 6c326e7215
commit 29bfdbb36b
1 changed files with 3 additions and 2 deletions
--- a/Source/Core/DolphinWX/Input/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Input/InputConfigDiag.cpp
@ -348,13 +348,14 @@ void ControlDialog::UpdateGUI()
    m_error_label->SetLabel(_("Syntax error"));
    break;
  case ParseStatus::Successful:
-    m_error_label->SetLabel(control_reference->BoundCount() > 0 ? "" : _("Device not found"));
+    m_error_label->SetLabel(control_reference->BoundCount() > 0 ? wxString{} :
+                                                                  _("Device not found"));
    break;
  case ParseStatus::EmptyExpression:
    m_error_label->SetLabel("");
    break;
  }
-};
+}

 void InputConfigDialog::UpdateGUI()
 {