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

[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.

This commit is contained in:
Lioncash 2013-08-26 12:56:35 -04:00
parent ba274368f8
commit e12c66b6cf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java
View File

@ -156,17 +156,18 @@ public final class InputConfigFragment extends PreferenceFragment
String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "-"; String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "-";
NativeLibrary.SetConfig("Dolphin.ini", "Android", pref.getKey(), bindStr); NativeLibrary.SetConfig("Dolphin.ini", "Android", pref.getKey(), bindStr);
pref.setSummary(bindStr); pref.setSummary(bindStr);
dialog.dismiss();
} }
else if (m_values.get(a) < (event.getAxisValue(range.getAxis()) - 0.5f)) else if (m_values.get(a) < (event.getAxisValue(range.getAxis()) - 0.5f))
{ {
String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "+"; String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "+";
NativeLibrary.SetConfig("Dolphin.ini", "Android", pref.getKey(), bindStr); NativeLibrary.SetConfig("Dolphin.ini", "Android", pref.getKey(), bindStr);
pref.setSummary(bindStr); pref.setSummary(bindStr);
dialog.dismiss();
} }
} }
} }
dialog.dismiss();
return true; return true;
} }
}); });