diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java index 80cd48332..1636f46ef 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java @@ -432,6 +432,12 @@ public final class EmulationActivity extends AppCompatActivity { return false; } InputDevice input = event.getDevice(); + + if (input == null) { + // Controller was disconnected + return false; + } + return NativeLibrary.onGamePadEvent(input.getDescriptor(), button, action); }