diff options
| author | JosJuice <josjuice@gmail.com> | 2017-09-17 11:11:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-17 11:11:37 +0200 |
| commit | 29bfdbb36b29b009656f5dd6a32acb6677ebf46e (patch) | |
| tree | d37f398976303c5a1ceff2cc3753a5a8d9b196ae /Source/Core/DolphinWX/Input/InputConfigDiag.cpp | |
| parent | d7aa49a1a7cac642d08c00ec42064c081f23891e (diff) | |
| parent | 6c326e721598f25c91a74f0e7e991f4f98c01a25 (diff) | |
Merge pull request #6071 from lioncash/inputconfig
InputConfigDiag: Fix building DolphinWX on the latest MSVC
Diffstat (limited to 'Source/Core/DolphinWX/Input/InputConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Input/InputConfigDiag.cpp | 5 |
1 files 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() { |
