j62
/
ctbrec
2
2
Fork 2
Code Issues 9 Pull Requests Packages Projects Releases 3 Wiki Activity

Fix NPE in DirectorySelectionBox

This commit is contained in:
0xboobface 2019-07-05 18:09:50 +02:00
parent 2bedb6497a
commit ef19e04751
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/java/ctbrec/ui/controls/DirectorySelectionBox.java
View File

@ -1,6 +1,7 @@
package ctbrec.ui.controls; package ctbrec.ui.controls;
import java.io.File; import java.io.File;
import java.util.Optional;
import javafx.stage.DirectoryChooser; import javafx.stage.DirectoryChooser;
@ -12,7 +13,8 @@ public class DirectorySelectionBox extends AbstractFileSelectionBox {
@Override @Override
protected void choose() { protected void choose() {
DirectoryChooser chooser = new DirectoryChooser(); DirectoryChooser chooser = new DirectoryChooser();
File currentDir = new File(fileProperty().get()); String preselection = Optional.ofNullable(fileProperty().get()).orElse(".");
File currentDir = new File(preselection);
if (currentDir.exists() && currentDir.isDirectory()) { if (currentDir.exists() && currentDir.isDirectory()) {
chooser.setInitialDirectory(currentDir); chooser.setInitialDirectory(currentDir);
} }