From 6c326e721598f25c91a74f0e7e991f4f98c01a25 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 17 Sep 2017 02:37:30 -0400
Subject: [PATCH] InputConfigDiag: Fix building DolphinWX on the latest MSVC

const char[1] and wxString() can both be converted to multiple common
types, so this results in an ambiguous conditional expression
compilation error (C2445)
---
 Source/Core/DolphinWX/Input/InputConfigDiag.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/Input/InputConfigDiag.cpp b/Source/Core/DolphinWX/Input/InputConfigDiag.cpp
index 1e6cba569d..bee240f63e 100644
--- 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()
 {