Skip to content
Snippets Groups Projects
Unverified Commit 7dcb77b1 authored by Yarick Yermak's avatar Yarick Yermak Committed by GitHub
Browse files

Merge pull request #302 from yermak/development

Fixed presets
parents eb9c0541 cd34a6bb
No related branches found
Tags version_5.5.26
No related merge requests found
......@@ -138,5 +138,9 @@ public class OutputParameters {
public ObservableValue<Double> getSpeedObservable() {
return speed;
}
protected void initSpeed() {
speed = new SimpleObjectProperty<>(1.0);
}
}
......@@ -71,7 +71,9 @@ public class Preset extends OutputParameters {
String property = AppProperties.getProperty("preset." + presetName);
if (property != null) {
Gson gson = new Gson();
return gson.fromJson(property, Preset.class);
Preset preset = gson.fromJson(property, Preset.class);
preset.initSpeed();
return preset;
}
return new Preset(presetName, Objects.requireNonNullElseGet(defaultValues.get(presetName), OutputParameters::new));
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment