From c2a8dc419c098b2fec4102d469ad3e81f67b821e Mon Sep 17 00:00:00 2001
From: Gliniak <153369+Gliniak@users.noreply.github.com>
Date: Wed, 25 Mar 2026 20:00:52 +0100
Subject: [PATCH] [APP] Check for null-ptr in input_system while calling
 OnUsbDeviceChanged

---
 src/xenia/app/emulator_window.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

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;