MVC: Defaults to GZDoom folder if selected

Lemon-King · Jun 16, 2024 · e9d337a · e9d337a
1 parent 6335958
commit e9d337a
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/src/main/java/lemon/hxdd/gui/MainViewController.java b/src/main/java/lemon/hxdd/gui/MainViewController.java
@@ -374,12 +374,18 @@ public void handle(ActionEvent actionEvent) {
     }
 
     protected void BindOpenFolderButton() {
+        String storedPath = this.mainApp.GetSettings().Get("PATH_GZDOOM");
+        if (storedPath.equals("")) {
+            storedPath = "./";
+        }
+
+        String finalStoredPath = storedPath;
         btnOpenFolder.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent actionEvent) {
                 Desktop desktop = Desktop.getDesktop();
                 try {
-                    desktop.open(new File("./"));
+                    desktop.open(new File(finalStoredPath));
                 } catch (IOException e) {
                     throw new RuntimeException(e);
                 }
@@ -560,11 +566,16 @@ protected File OpenFileDialog(File path, String title, String fileTypeDescriptio
         FileChooser.ExtensionFilter ext = new FileChooser.ExtensionFilter(fileTypeDescription, targetExtension);
         FileChooser chooser = new FileChooser();
 
-        File targetPath;
-        if (path.exists() && path.isFile()) {
-            targetPath = new File(path.getParent());
-        } else {
-            targetPath = path;
+        File targetPath = path;
+        if (path.equals(new File("./")) || path.getPath().equals(new File(""))) {
+            String storedPath = this.mainApp.GetSettings().Get("PATH_GZDOOM");
+            if (storedPath.equals("")) {
+                storedPath = "./";
+            }
+            targetPath = new File(storedPath);
+        }
+        if (targetPath.exists() && targetPath.isFile()) {
+            targetPath = new File(targetPath.getParent());
         }
 
         chooser.setTitle(title);