Skip to content

Commit 881b1c6

Browse files
committed
Add default displayname setting.
1 parent 48b52d5 commit 881b1c6

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

src/main/java/de/presti/ree6/sql/SQLWorker.java

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,12 +1412,19 @@ public void setSetting(Setting setting) {
14121412

14131413
// Check if it is null.
14141414
if (setting.getValue() == null) {
1415-
Setting defaultSetting = SettingsManager.getDefault(setting.getName());
1416-
if (defaultSetting != null) {
1417-
setting.setValue(defaultSetting.getValue());
1418-
} else {
1419-
return;
1420-
}
1415+
Object defaultValue = SettingsManager.getDefaultValue(setting.getName());
1416+
1417+
if (defaultValue == null) return;
1418+
1419+
setting.setValue(defaultValue);
1420+
}
1421+
1422+
if (setting.getDisplayName() == null) {
1423+
String defaultDisplayName = SettingsManager.getDefaultDisplayName(setting.getName());
1424+
1425+
if (defaultDisplayName == null) return;
1426+
1427+
setting.setDisplayName(defaultDisplayName);
14211428
}
14221429

14231430
Setting databaseSetting =

0 commit comments

Comments
 (0)