Fix bug: "split bigger than" not being changeable
This commit is contained in:
parent
c44749ac16
commit
844295101e
|
@ -290,7 +290,6 @@ public class CtbrecPreferencesStorage implements PreferencesStorage {
|
||||||
ComboBox<Object> comboBox = new ComboBox(listProp);
|
ComboBox<Object> comboBox = new ComboBox(listProp);
|
||||||
Field field = Settings.class.getField(setting.getKey());
|
Field field = Settings.class.getField(setting.getKey());
|
||||||
Object value = field.get(settings);
|
Object value = field.get(settings);
|
||||||
LOG.debug("{} {} {}", setting.getName(), value, setting.getProperty().getValue());
|
|
||||||
if (StringUtil.isNotBlank(value.toString())) {
|
if (StringUtil.isNotBlank(value.toString())) {
|
||||||
if (setting.getConverter() != null) {
|
if (setting.getConverter() != null) {
|
||||||
comboBox.getSelectionModel().select(setting.getConverter().convertTo(value));
|
comboBox.getSelectionModel().select(setting.getConverter().convertTo(value));
|
||||||
|
|
|
@ -343,9 +343,7 @@ public class SettingsTab extends Tab implements TabSelectionListener {
|
||||||
|
|
||||||
private void splitValuesChanged(ObservableValue<?> value, Object oldV, Object newV) {
|
private void splitValuesChanged(ObservableValue<?> value, Object oldV, Object newV) {
|
||||||
boolean splitAfterSet = settings.splitRecordingsAfterSecs > 0;
|
boolean splitAfterSet = settings.splitRecordingsAfterSecs > 0;
|
||||||
LOG.debug("after {}", settings.splitRecordingsAfterSecs);
|
|
||||||
boolean splitBiggerThanSet = settings.splitRecordingsBiggerThanBytes > 0;
|
boolean splitBiggerThanSet = settings.splitRecordingsBiggerThanBytes > 0;
|
||||||
LOG.debug("bigger {}", settings.splitRecordingsBiggerThanBytes);
|
|
||||||
if (splitAfterSet && splitBiggerThanSet) {
|
if (splitAfterSet && splitBiggerThanSet) {
|
||||||
settings.splitStrategy = TIME_OR_SIZE;
|
settings.splitStrategy = TIME_OR_SIZE;
|
||||||
} else if (splitAfterSet) {
|
} else if (splitAfterSet) {
|
||||||
|
@ -355,7 +353,6 @@ public class SettingsTab extends Tab implements TabSelectionListener {
|
||||||
} else {
|
} else {
|
||||||
settings.splitStrategy = DONT;
|
settings.splitStrategy = DONT;
|
||||||
}
|
}
|
||||||
LOG.debug("strats {}", settings.splitStrategy);
|
|
||||||
saveConfig();
|
saveConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -587,7 +584,7 @@ public class SettingsTab extends Tab implements TabSelectionListener {
|
||||||
if (getClass() != obj.getClass())
|
if (getClass() != obj.getClass())
|
||||||
return false;
|
return false;
|
||||||
SplitBiggerThanOption other = (SplitBiggerThanOption) obj;
|
SplitBiggerThanOption other = (SplitBiggerThanOption) obj;
|
||||||
return value != other.value;
|
return value == other.value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ValueConverter converter() {
|
public static ValueConverter converter() {
|
||||||
|
|
Loading…
Reference in New Issue