Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: EmulationActivity: Fix a crash when controller is disconnected.

Browse Source
This commit is contained in:
bunnei 2020-05-01 00:19:41 -04:00
parent 1882dba04f
commit 03be46f7df
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java
View File

@ -432,6 +432,12 @@ public final class EmulationActivity extends AppCompatActivity {
return false; return false;
} }
InputDevice input = event.getDevice(); InputDevice input = event.getDevice();
if (input == null) {
// Controller was disconnected
return false;
}
return NativeLibrary.onGamePadEvent(input.getDescriptor(), button, action); return NativeLibrary.onGamePadEvent(input.getDescriptor(), button, action);
} }