[Android] Fix a null pointer exception.

dolphin-emu · Jul 14, 2013 · c86480d · c86480d
1 parent ea14662
commit c86480d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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