From e12c66b6cf0276c85b1dcb1a255c6c5c24647711 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 26 Aug 2013 12:56:35 -0400 Subject: [PATCH] [Android] Only dismiss the input dialog when an input is registered. Before it would dismiss upon the first event. Fixes a bug where control sticks wouldn't register because of the AlertDialog closing immediately after the "if (firstEvent)" branch. --- .../dolphinemu/dolphinemu/settings/InputConfigFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java index 8c9f6f0be4..5340fb9b6c 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java @@ -156,17 +156,18 @@ public final class InputConfigFragment extends PreferenceFragment String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "-"; NativeLibrary.SetConfig("Dolphin.ini", "Android", pref.getKey(), bindStr); pref.setSummary(bindStr); + dialog.dismiss(); } else if (m_values.get(a) < (event.getAxisValue(range.getAxis()) - 0.5f)) { String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "+"; NativeLibrary.SetConfig("Dolphin.ini", "Android", pref.getKey(), bindStr); pref.setSummary(bindStr); + dialog.dismiss(); } } } - dialog.dismiss(); return true; } });