diff options
| author | JosJuice <josjuice@gmail.com> | 2018-08-19 20:32:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 20:32:21 +0200 |
| commit | c3b0208de641669b7df9b924da3d75beb733be9e (patch) | |
| tree | e5f4f4959758e04bb6d5fd6c0ff5185c10c264c1 /Source/Android/app/src/main/java | |
| parent | b2880d0330fc4c03fb244207c6205dacb8cf1c81 (diff) | |
| parent | afc1876e494e47a494c02f1385fcc915e769ded7 (diff) | |
Merge pull request #7340 from zackhow/enable-touch-con
Android: Set GC controller 1 to enabled if settings don't exist
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java index 2260b413f7..f19034cc16 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java @@ -481,7 +481,8 @@ public final class SettingsFile String key = SettingsFile.KEY_GCPAD_TYPE + i; if (coreSection.getSetting(key) == null) { - Setting gcPadSetting = new IntSetting(key, Settings.SECTION_INI_CORE,0); + // Set GameCube controller 1 to enabled, all others disabled + Setting gcPadSetting = new IntSetting(key, Settings.SECTION_INI_CORE, i == 0 ? 6 : 0); coreSection.putSetting(gcPadSetting); } } |