ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Don't copy global INIs into game INIs 

See the source code comment in the next commit for why this is bad.
This commit is contained in:
JosJuice 2019-06-17 15:31:20 +02:00
parent 0a7395bfba
commit 7652023407
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
View File

@ -97,31 +97,23 @@ public class Settings
{ {
sections = new Settings.SettingsSectionMap(); sections = new Settings.SettingsSectionMap();
HashSet<String> filesToExclude = new HashSet<>(); if (TextUtils.isEmpty(gameId))
if (!TextUtils.isEmpty(gameId))
{ {
// for per-game settings, don't load the WiiMoteNew.ini settings loadDolphinSettings(view);
filesToExclude.add(SettingsFile.FILE_NAME_WIIMOTE);
} }
else
loadDolphinSettings(view, filesToExclude);
if (!TextUtils.isEmpty(gameId))
{ {
loadGenericGameSettings(gameId, view); loadGenericGameSettings(gameId, view);
loadCustomGameSettings(gameId, view); loadCustomGameSettings(gameId, view);
} }
} }
private void loadDolphinSettings(SettingsActivityView view, HashSet<String> filesToExclude) private void loadDolphinSettings(SettingsActivityView view)
{ {
for (Map.Entry<String, List<String>> entry : configFileSectionsMap.entrySet()) for (Map.Entry<String, List<String>> entry : configFileSectionsMap.entrySet())
{ {
String fileName = entry.getKey(); String fileName = entry.getKey();
if (filesToExclude == null || !filesToExclude.contains(fileName)) sections.putAll(SettingsFile.readFile(fileName, view));
{
sections.putAll(SettingsFile.readFile(fileName, view));
}
} }
} }