diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-07-14 16:31:47 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-07-14 16:31:47 -0500 |
| commit | c86480d08288a7fc3299b3de08d14c6aa13ccf58 (patch) | |
| tree | 5d49b38d76974a85f84550f7f8b41d300241923a /Source/Android | |
| parent | ea146627e6352609ce5ba1471387652e1c548d78 (diff) | |
[Android] Fix a null pointer exception.
Diffstat (limited to 'Source/Android')
| -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 |