summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLéo Lam <leolino.lam@gmail.com>2018-02-04 12:54:14 +0100
committerGitHub <noreply@github.com>2018-02-04 12:54:14 +0100
commit44391ad2fedc41ef5ae19cc848845d1003f9727d (patch)
tree3badb54654266c2f5764d2efd213c2f7cfd105fa
parent32d206362fa5bd09037390e204c33e0953852454 (diff)
parent489f478751071eca22ffca8ef19a528158db408f (diff)
Merge pull request #6353 from spycrab/qt_fix_invdev
Qt/MappingWindow: Fix invalid device being selected by default
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
index 7c0c72d40f..3ceaaa5b87 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
@@ -224,7 +224,8 @@ void MappingWindow::RefreshDevices()
const auto default_device = m_controller->GetDefaultDevice().ToString();
- m_devices_combo->addItem(QString::fromStdString(default_device));
+ if (!default_device.empty())
+ m_devices_combo->addItem(QString::fromStdString(default_device));
for (const auto& name : g_controller_interface.GetAllDeviceStrings())
{