From b7995ba236f6ed73c66ee70e216d6b0abe5b707a Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Fri, 4 Dec 2020 16:32:23 +0100
Subject: [PATCH] Save last folder on playlist append
---
.../desktop/listener/PadNewContentListener.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java
index a4f8d15c..fedd12ae 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java
@@ -31,7 +31,7 @@ public class PadNewContentListener {
public List<File> showMediaOpenFileChooser(ActionEvent event, String[] supportedFileTypes, boolean multiSelect) {
GlobalSettings settings = PlayPadPlugin.getInstance().getGlobalSettings();
if (pad.getProject() != null && settings.isLiveMode() && settings.isLiveModeFile() && pad.getProject().getActivePlayers() > 0) {
- return null;
+ return Collections.emptyList();
}
final FileChooser chooser = new FileChooser();
@@ -47,12 +47,18 @@ public class PadNewContentListener {
}
}
+ final List<File> selectedFiles;
final Window window = ((Node) event.getTarget()).getScene().getWindow();
if (multiSelect) {
- return chooser.showOpenMultipleDialog(window);
+ selectedFiles = chooser.showOpenMultipleDialog(window);
} else {
- return Collections.singletonList(chooser.showOpenDialog(window));
+ selectedFiles = Collections.singletonList(chooser.showOpenDialog(window));
}
+
+ if (selectedFiles != null && !selectedFiles.isEmpty()) {
+ ApplicationUtils.getApplication().getUserDefaults().setData(DesktopPadViewController.OPEN_FOLDER, selectedFiles.get(0).getParent());
+ }
+ return selectedFiles;
}
public void onNew(ActionEvent event, PadContentFactory.PadContentTypeChooser padContentTypeChooser) throws NoSuchComponentException {
@@ -76,8 +82,6 @@ public class PadNewContentListener {
setNewPadContent(path, padContent);
}
}
-
- ApplicationUtils.getApplication().getUserDefaults().setData(DesktopPadViewController.OPEN_FOLDER, path.getParent().toString());
}
}
--
GitLab