From 4ac39ef5081e949219ffe6d7a4402edaf3ac196a Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Fri, 1 May 2020 00:19:41 -0400
Subject: [PATCH] android: EmulationActivity: Fix a crash when controller is
 disconnected.

---
 .../org/citra/citra_emu/activities/EmulationActivity.java   | 6 ++++++
 1 file changed, 6 insertions(+)

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);
     }