Merge pull request #6806 from spycrab/qt_iowindow_crash

Qt/IOWindow: Fix crash
dolphin-emu · May 10, 2018 · 3cca051 · 3cca051
2 parents d8e1d2d + 146979f
commit 3cca051
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp
@@ -217,6 +217,9 @@ void IOWindow::UpdateOptionList()
 
   const auto device = g_controller_interface.FindDevice(m_devq);
 
+  if (device == nullptr)
+    return;
+
   if (m_reference->IsInput())
   {
     for (const auto* input : device->Inputs())