ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

config manager: fix resetting configuration items with no default value

Browse Source 
Also don't reset config to the already existing value
This commit is contained in:
Adam
2018-05-28 14:17:02 -04:00
parent 1a373f62aa
commit 7378d53cdd
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
View File

@@ -43,6 +43,7 @@ import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -390,11 +391,25 @@ public class ConfigManager
{ {
ConfigItem item = method.getAnnotation(ConfigItem.class); ConfigItem item = method.getAnnotation(ConfigItem.class);
if (item == null || !method.isDefault()) if (item == null)
{ {
continue; continue;
} }
if (!method.isDefault())
{
if (override)
{
String current = getConfiguration(group.keyName(), item.keyName());
// only unset if already set
if (current != null)
{
unsetConfiguration(group.keyName(), item.keyName());
}
}
continue;
}
if (!override) if (!override)
{ {
String current = getConfiguration(group.keyName(), item.keyName()); String current = getConfiguration(group.keyName(), item.keyName());
@@ -415,9 +430,15 @@ public class ConfigManager
continue; continue;
} }
String current = getConfiguration(group.keyName(), item.keyName());
String valueString = objectToString(defaultValue);
if (Objects.equals(current, valueString))
{
continue; // already set to the default value
}
log.debug("Setting default configuration value for {}.{} to {}", group.keyName(), item.keyName(), defaultValue); log.debug("Setting default configuration value for {}.{} to {}", group.keyName(), item.keyName(), defaultValue);
String valueString = objectToString(defaultValue);
setConfiguration(group.keyName(), item.keyName(), valueString); setConfiguration(group.keyName(), item.keyName(), valueString);
} }
} }