diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java index d76d9ec688..3eb9e1d2f7 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java @@ -97,31 +97,23 @@ public class Settings { sections = new Settings.SettingsSectionMap(); - HashSet filesToExclude = new HashSet<>(); - if (!TextUtils.isEmpty(gameId)) + if (TextUtils.isEmpty(gameId)) { - // for per-game settings, don't load the WiiMoteNew.ini settings - filesToExclude.add(SettingsFile.FILE_NAME_WIIMOTE); + loadDolphinSettings(view); } - - loadDolphinSettings(view, filesToExclude); - - if (!TextUtils.isEmpty(gameId)) + else { loadGenericGameSettings(gameId, view); loadCustomGameSettings(gameId, view); } } - private void loadDolphinSettings(SettingsActivityView view, HashSet filesToExclude) + private void loadDolphinSettings(SettingsActivityView view) { for (Map.Entry> entry : configFileSectionsMap.entrySet()) { String fileName = entry.getKey(); - if (filesToExclude == null || !filesToExclude.contains(fileName)) - { - sections.putAll(SettingsFile.readFile(fileName, view)); - } + sections.putAll(SettingsFile.readFile(fileName, view)); } }