Merge pull request #7336 from zackhow/extension-ui-bug

Android: Fix wiimote extension from defaulting to none in UI
This commit is contained in:
JosJuice 2018-08-19 20:31:21 +02:00 committed by GitHub
commit b2880d0330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -553,7 +553,7 @@ public final class SettingsFragmentPresenter
SettingSection bindingsSection = mSettings.getSection(Settings.SECTION_BINDINGS);
// Bindings use controller numbers 4-7 (0-3 are GameCube), but the extension setting uses 1-4.
IntSetting extension = new IntSetting(SettingsFile.KEY_WIIMOTE_EXTENSION, Settings.SECTION_WIIMOTE + wiimoteNumber, getExtensionValue(wiimoteNumber), MenuTag.getWiimoteExtensionMenuTag(wiimoteNumber));
IntSetting extension = new IntSetting(SettingsFile.KEY_WIIMOTE_EXTENSION, Settings.SECTION_WIIMOTE + wiimoteNumber, getExtensionValue(wiimoteNumber - 3), MenuTag.getWiimoteExtensionMenuTag(wiimoteNumber));
Setting bindA = bindingsSection.getSetting(SettingsFile.KEY_WIIBIND_A + wiimoteNumber);
Setting bindB = bindingsSection.getSetting(SettingsFile.KEY_WIIBIND_B + wiimoteNumber);
Setting bind1 = bindingsSection.getSetting(SettingsFile.KEY_WIIBIND_1 + wiimoteNumber);