mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-02 19:12:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

InputConfigDiag: Fix building DolphinWX on the latest MSVC

Browse Source 
const char[1] and wxString() can both be converted to multiple common
types, so this results in an ambiguous conditional expression
compilation error (C2445)
This commit is contained in:
Lioncash 2017-09-17 02:37:30 -04:00
parent d7aa49a1a7
commit 6c326e7215
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinWX/Input/InputConfigDiag.cpp
View File

@ -348,13 +348,14 @@ void ControlDialog::UpdateGUI()
m_error_label->SetLabel(_("Syntax error")); m_error_label->SetLabel(_("Syntax error"));
break; break;
case ParseStatus::Successful: 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; break;
case ParseStatus::EmptyExpression: case ParseStatus::EmptyExpression:
m_error_label->SetLabel(""); m_error_label->SetLabel("");
break; break;
} }
}; }
void InputConfigDialog::UpdateGUI() void InputConfigDialog::UpdateGUI()
{ {