diff options
Diffstat (limited to 'Source/Android/src')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java index 607af71766..0057901eec 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java @@ -29,6 +29,8 @@ public class InputConfigActivity extends ListActivity { static public String getInputDesc(InputDevice input) { + if (input == null) + return "null"; // Happens when the inputdevice is from an unknown source if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) return input.getDescriptor(); else |