summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2017-03-03 00:39:12 +0100
committerGitHub <noreply@github.com>2017-03-03 00:39:12 +0100
commit56afabb9a840db95d3aa0c5ccaee44f1c8c7f4d0 (patch)
tree45fbb3b07ce81d99b688252634afa4f8d7680718 /Source/Android/app/src/main/java
parent4e062d1bf6e1754325b5d55e6df65ee3d4769a9c (diff)
parent3d8ab184acae9288d4d7bcd13bea7b11c6493075 (diff)
Merge pull request #4919 from ntruhan/master
Android: Sort configuration ini files
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java
index a228314e52..707e345d26 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java
@@ -20,6 +20,7 @@ import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Set;
+import java.util.TreeSet;
/**
* Contains static methods for interacting with .ini files in which settings are stored.
@@ -322,8 +323,9 @@ public final class SettingsFile
writer = new PrintWriter(ini, "UTF-8");
Set<String> keySet = sections.keySet();
+ Set<String> sortedKeySet = new TreeSet<>(keySet);
- for (String key : keySet)
+ for (String key : sortedKeySet)
{
SettingSection section = sections.get(key);
writeSection(writer, section);
@@ -437,8 +439,9 @@ public final class SettingsFile
// Write this section's values.
HashMap<String, Setting> settings = section.getSettings();
Set<String> keySet = settings.keySet();
+ Set<String> sortedKeySet = new TreeSet<>(keySet);
- for (String key : keySet)
+ for (String key : sortedKeySet)
{
Setting setting = settings.get(key);
String settingString = settingAsString(setting);