[Android] Fix a null pointer exception.

2013-07-14 16:31:47 -05:00 · 2013-07-14 16:31:47 -05:00 · c86480d082
parent ea146627e6
commit c86480d082
1 changed files with 2 additions and 0 deletions
--- 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