From c86480d08288a7fc3299b3de08d14c6aa13ccf58 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 14 Jul 2013 16:31:47 -0500
Subject: [PATCH] [Android] Fix a null pointer exception.

---
 .../src/org/dolphinemu/dolphinemu/InputConfigActivity.java      | 2 ++
 1 file changed, 2 insertions(+)

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