diff --git a/src/xenia/app/emulator_window.cc b/src/xenia/app/emulator_window.cc index e49159e69..baa7bd99b 100644 --- a/src/xenia/app/emulator_window.cc +++ b/src/xenia/app/emulator_window.cc @@ -305,6 +305,14 @@ void EmulatorWindow::EmulatorWindowListener::OnMouseUp(ui::MouseEvent& e) { void EmulatorWindow::EmulatorWindowListener::OnUsbDeviceChanged( bool is_arrival) { + if (!emulator_window_.emulator()) { + return; + } + + if (!emulator_window_.emulator()->input_system()) { + return; + } + auto* portal = emulator_window_.emulator()->input_system()->GetPortal(); if (!portal) { return;