summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzackhow <zackhow@gmail.com>2018-10-14 15:09:21 -0400
committerzackhow <zackhow@gmail.com>2018-10-28 20:22:06 -0400
commit471485071d7265ad57bbddd6fa4b052d463ffb4e (patch)
treeef5f9e7f20a752091772cea0c568f1b6a6bd9a84
parent405b37deaa4b59659906d709dbe7a220cc875b74 (diff)
Android: Move profile check to when it is saving
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java30
1 files changed, 17 insertions, 13 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 04b36cb84f..79315dbe90 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
@@ -499,6 +499,22 @@ public final class SettingsFile
{
String profile = gameId + "_Wii" + padId;
+ String wiiConfigPath =
+ DirectoryInitialization.getUserDirectory() + "/Config/Profiles/Wiimote/" +
+ profile + ".ini";
+ File wiiProfile = new File(wiiConfigPath);
+ // If it doesn't exist, create it
+ if (!wiiProfile.exists())
+ {
+ String defautlWiiProfilePath =
+ DirectoryInitialization.getUserDirectory() +
+ "/Config/Profiles/Wiimote/WiimoteProfile.ini";
+ DirectoryInitialization.copyFile(defautlWiiProfilePath, wiiConfigPath);
+
+ NativeLibrary.SetProfileSetting(profile, Settings.SECTION_PROFILE, "Device",
+ "Android/" + (Integer.valueOf(padId) + 4) + "/Touchscreen");
+ }
+
NativeLibrary.SetProfileSetting(profile, Settings.SECTION_PROFILE, key,
value);
@@ -565,19 +581,7 @@ public final class SettingsFile
DirectoryInitialization.getUserDirectory() + "/Config/Profiles/Wiimote/" +
profile + ".ini";
- File wiiProfile = new File(wiiConfigPath);
- // If it doesn't exist, create it
- if (!wiiProfile.exists())
- {
- String defautlWiiProfilePath =
- DirectoryInitialization.getUserDirectory() +
- "/Config/Profiles/Wiimote/WiimoteProfile.ini";
- DirectoryInitialization.copyFile(defautlWiiProfilePath, wiiConfigPath);
-
- NativeLibrary.SetProfileSetting(profile, Settings.SECTION_PROFILE, "Device",
- "Android/" + (Integer.valueOf(padId) + 4) + "/Touchscreen");
- }
- return wiiProfile;
+ return new File(wiiConfigPath);
}
private static SettingSection sectionFromLine(String line, boolean isCustomGame)