Merge pull request #6071 from lioncash/inputconfig

InputConfigDiag: Fix building DolphinWX on the latest MSVC
dolphin-emu · Sep 17, 2017 · 29bfdbb · 29bfdbb
2 parents d7aa49a + 6c326e7
commit 29bfdbb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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()
 {