ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Android] Fix a null pointer exception.

This commit is contained in:
Ryan Houdek 2013-07-14 16:31:47 -05:00
parent ea146627e6
commit c86480d082
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
View File

@ -29,6 +29,8 @@ public class InputConfigActivity extends ListActivity {
static public String getInputDesc(InputDevice input) 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) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
return input.getDescriptor(); return input.getDescriptor();
else else