Merge pull request #6806 from spycrab/qt_iowindow_crash

Qt/IOWindow: Fix crash
2018-05-10 21:18:48 +02:00 · 2018-05-10 21:18:48 +02:00 · 3cca051850
parent d8e1d2d573 146979f67e
commit 3cca051850
1 changed files with 3 additions and 0 deletions
--- 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())