Merge pull request #6353 from spycrab/qt_fix_invdev

Qt/MappingWindow: Fix invalid device being selected by default
dolphin-emu · Feb 4, 2018 · 44391ad · 44391ad
2 parents 32d2063 + 489f478
commit 44391ad
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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())
     {