diff options
| author | JosJuice <josjuice@gmail.com> | 2018-08-19 20:31:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 20:31:21 +0200 |
| commit | b2880d0330fc4c03fb244207c6205dacb8cf1c81 (patch) | |
| tree | 702fdcbac52a3e1c0e35f16a324cd2a4838decf3 /Source/Android/app/src/main/java/org | |
| parent | 5eca5f69c5e15625c99eb4d95d11761756bb1de1 (diff) | |
| parent | a20513eff995a4624473fb84ecdf46bea4a04866 (diff) | |
Merge pull request #7336 from zackhow/extension-ui-bug
Android: Fix wiimote extension from defaulting to none in UI
Diffstat (limited to 'Source/Android/app/src/main/java/org')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index fbdaf8ad92..e644ce469b 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -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); |