summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorzackhow <zackhow@gmail.com>2018-08-16 18:50:02 -0400
committerzackhow <zackhow@gmail.com>2018-08-17 08:20:22 -0400
commitafc1876e494e47a494c02f1385fcc915e769ded7 (patch)
treec127783ac32fb987e626ae184a72793fb585a581 /Source/Android/app/src/main/java
parent8e5c3d5b4eff43b9e830831efc91dccf77f00b66 (diff)
Android: Set GC controller 1 to enabled if settings don't exist
If a user changes any config options before starting emulation then all SIDevices are set to 0. This was added in PR 6267(commit 58ee9d2a78fddff454088cc0ceb8bb46cbb811e8) to fix a bug.
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.java3
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);
}
}